2 files changed, 9 insertions, 1 deletions

diff --git a/lib/authentication.rb b/lib/authentication.rb
index 56df391..4d8a5ae 100644
--- a/lib/authentication.rb
+++ b/lib/authentication.rb
@@ -98,7 +98,7 @@ module Authentication
       end
 
       def password_required?
-        crypted_password.blank? || !password.blank?
+        (crypted_password.blank? && password_digest.blank?) || !password.blank?
       end
     end # instance methods
   end
diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index 514bdea..feccce2 100644
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -118,6 +118,14 @@ class UserTest < ActiveSupport::TestCase
     # Second login should now use password_digest.
     assert_equal user, User.authenticate("quentin", "monkey")
   end
+
+  def test_migrated_user_can_be_updated_without_password
+    user = users(:quentin)
+    assert_equal user, User.authenticate("quentin", "monkey")
+    user.reload
+
+    assert user.update(:email => "quentin@example.org")
+  end
   
 protected
   def create_user(options = {})