diff --git a/gluon/tools.py b/gluon/tools.py
index c9d82a74..63c8d3a2 100644
--- a/gluon/tools.py
+++ b/gluon/tools.py
@@ -1146,7 +1146,6 @@ class Auth(object):
         registration_requires_approval=False,
         bulk_register_enabled=False,
         login_after_registration=False,
-        login_once_after_registration=False,
         login_after_password_change=True,
         alternate_requires_registration=False,
         create_user_groups="user_%(id)s",
@@ -3056,9 +3055,8 @@ class Auth(object):
                 table_user[form.vars.id] = dict(registration_key='pending')
                 session.flash = self.messages.registration_pending
             elif (not self.settings.registration_requires_verification or
-                  self.settings.login_after_registration or 
-                  self.settings.login_once_after_registration):
-                if self.settings.login_after_registration:
+                      self.settings.login_after_registration):
+                if not self.settings.registration_requires_verification:
                     table_user[form.vars.id] = dict(registration_key='')
                 session.flash = self.messages.registration_successful
                 user = table_user(**{username: form.vars[username]})