diff --git a/lib/devise/models/lockable.rb b/lib/devise/models/lockable.rb
index 65bb400d0..ae89420d2 100644
--- a/lib/devise/models/lockable.rb
+++ b/lib/devise/models/lockable.rb
@@ -187,12 +187,10 @@ def send_unlock_instructions(attributes = {})
         # If the user is not locked, creates an error for the user
         # Options must have the unlock_token
         def unlock_access_by_token(unlock_token)
-          original_token = unlock_token
-          unlock_token   = Devise.token_generator.digest(self, :unlock_token, unlock_token)
+          unlock_token = Devise.token_generator.digest(self, :unlock_token, unlock_token)
 
           lockable = find_or_initialize_with_error_by(:unlock_token, unlock_token)
           lockable.unlock_access! if lockable.persisted?
-          lockable.unlock_token = original_token
           lockable
         end
 
diff --git a/test/models/lockable_test.rb b/test/models/lockable_test.rb
index b1d8cab0d..961f7c1a9 100644
--- a/test/models/lockable_test.rb
+++ b/test/models/lockable_test.rb
@@ -201,7 +201,9 @@ def setup
     raw  = user.send_unlock_instructions
     locked_user = User.unlock_access_by_token(raw)
     assert_equal user, locked_user
+    assert_not locked_user.changed?
     assert_not user.reload.access_locked?
+    assert_nil user.reload.unlock_token
   end
 
   test 'should return a new record with errors when a invalid token is given' do