From 3269e1a3f54cb81aec427b76041e1a2194343f33 Mon Sep 17 00:00:00 2001 From: Vinyl Darkscratch Date: Tue, 29 Jan 2019 20:39:16 -0800 Subject: [PATCH] Fix #2044 --- gluon/tools.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gluon/tools.py b/gluon/tools.py index fb07d303..de3223d6 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -2260,9 +2260,9 @@ class Auth(AuthAPI): def _get_login_settings(self): table_user = self.table_user() - userfield = self.settings.login_userfield or 'username' \ + userfield = self.settings.login_userfield or ('username' \ if self.settings.login_userfield or 'username' \ - in table_user.fields else 'email' + in table_user.fields else 'email') passfield = self.settings.password_field return Storage({'table_user': table_user, 'userfield': userfield,