diff --git a/app/models/email_token.rb b/app/models/email_token.rb
index 673c88432a1..4feea3fa5a1 100644
--- a/app/models/email_token.rb
+++ b/app/models/email_token.rb
@@ -75,7 +75,9 @@ class EmailToken < ActiveRecord::Base
       end
 
       if user
-        return User.find_by_email(user.email) if Invite.redeem_from_email(user.email).present?
+        if Invite.redeem_from_email(user.email).present?
+          return user.reload
+        end
         user
       end
     end