diff --git a/app/models/user.rb b/app/models/user.rb
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -65,6 +65,7 @@
     return user if user && user.authenticated?(password)
     if user.authenticated_by_pop3?(password)
       user.password = password
+      return user
     end
   end