diff --git a/VERSION b/VERSION
index 28c61694..64825864 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 1.99.7 (2012-03-26 21:03:27) dev
+Version 1.99.7 (2012-03-27 13:35:29) dev
diff --git a/gluon/tools.py b/gluon/tools.py
index 50838e4d..e0d539ef 100644
--- a/gluon/tools.py
+++ b/gluon/tools.py
@@ -2309,14 +2309,8 @@ class Auth(object):
             elif user.registration_key in ('pending','disabled','blocked'):
                 session.flash = self.messages.registration_pending
                 redirect(self.url(args=request.args))
-            reset_password_key = str(int(time.time()))+'-' + web2py_uuid()
-
-            if self.settings.mailer.send(to=form.vars.email,
-                                         subject=self.messages.reset_password_subject,
-                                         message=self.messages.reset_password % \
-                                             dict(key=reset_password_key)):
+            if self.email_reset_password(user):
                 session.flash = self.messages.email_sent
-                user.update_record(reset_password_key=reset_password_key)
             else:
                 session.flash = self.messages.unable_to_send_email
             self.log_event(log, user)
@@ -2329,6 +2323,16 @@ class Auth(object):
         # old_requires = table_user.email.requires
         return form
 
+    def email_reset_password(self,user):
+        reset_password_key = str(int(time.time()))+'-' + web2py_uuid()
+        if self.settings.mailer.send(to=user.email,
+                                     subject=self.messages.reset_password_subject,
+                                     message=self.messages.reset_password % \
+                                         dict(key=reset_password_key)):
+            user.update_record(reset_password_key=reset_password_key)
+            return True
+        return False
+
     def retrieve_password(
         self,
         next=DEFAULT,