diff --git a/app/models/user.rb b/app/models/user.rb
index 6eb087cc5b..fcf52c1805 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -77,4 +77,8 @@ def full_name
   def admin?
     self.has_role?(:admin) || self.has_role?(:owner)
   end
+
+  def active_for_authentication?
+    super and self.kept?
+  end
 end