diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index 044a40a2..54d45c9c 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -2,6 +2,7 @@
 
 * enhancements
   * Add support for e-mail reconfirmation on change (by github.com/Mandaryn and github.com/heimidal)
+  * Redirect users to sign in page after unlock (by github.com/nashby)
 
 * deprecation
   * Devise.apply_schema is deprecated
diff --git a/lib/devise/models/recoverable.rb b/lib/devise/models/recoverable.rb
index c148e128..af5d2395 100644
--- a/lib/devise/models/recoverable.rb
+++ b/lib/devise/models/recoverable.rb
@@ -40,7 +40,7 @@ module Devise
 
       # Resets reset password token and send reset password instructions by email
       def send_reset_password_instructions
-        generate_reset_password_token! if should_generate_token?
+        generate_reset_password_token! if should_generate_reset_token?
         self.devise_mailer.reset_password_instructions(self).deliver
       end
 
@@ -70,7 +70,7 @@ module Devise
 
       protected
 
-        def should_generate_token?
+        def should_generate_reset_token?
           reset_password_token.nil? || !reset_password_period_valid?
         end