diff --git a/gluon/tools.py b/gluon/tools.py
index 1f02c859..c27c7b0d 100644
--- a/gluon/tools.py
+++ b/gluon/tools.py
@@ -3451,6 +3451,10 @@ class Auth(object):
             session.flash = self.messages.invalid_reset_password
             redirect(next, client_side=self.settings.client_side)
 
+        if user.registration_key in ('pending', 'disabled', 'blocked'):
+            session.flash = self.messages.registration_pending
+            redirect(next, client_side=self.settings.client_side)
+
         if onvalidation is DEFAULT:
             onvalidation = self.settings.reset_password_onvalidation
         if onaccept is DEFAULT: