diff --git a/app/models/user.rb b/app/models/user.rb
index 7ba8b057f91..fd7ff74a25e 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1029,6 +1029,7 @@ class User < ActiveRecord::Base
       UserAuthToken.where(user_id: id).destroy_all
       # We should not carry this around after save
       @raw_password = nil
+      @password_required = false
     end
   end