diff --git a/flask_security/core.py b/flask_security/core.py
index 7bee606..ae6f738 100644
--- a/flask_security/core.py
+++ b/flask_security/core.py
@@ -219,7 +219,7 @@ class Security(object):
         login_manager.anonymous_user = AnonymousUser
         login_manager.login_view = utils.config_value(app, 'LOGIN_VIEW')
         login_manager.user_loader(load_user)
-        login_manager.setup_app(app)
+        login_manager.init_app(app)
 
         Provider = utils.get_class_from_string(app, 'AUTH_PROVIDER')
         pw_hash = utils.config_value(app, 'PASSWORD_HASH')
diff --git a/flask_security/recoverable.py b/flask_security/recoverable.py
index 0ec377b..6387506 100644
--- a/flask_security/recoverable.py
+++ b/flask_security/recoverable.py
@@ -47,7 +47,7 @@ def generate_reset_password_token(user):
 
     try:
         user['reset_password_token'] = token
-        user['reset_password_token'] = now
+        user['reset_password_sent_at'] = now
     except TypeError:
         user.reset_password_token = token
         user.reset_password_sent_at = now