diff --git a/lib/auth/facebook_authenticator.rb b/lib/auth/facebook_authenticator.rb
index c7592cac60b..e5e203971ce 100644
--- a/lib/auth/facebook_authenticator.rb
+++ b/lib/auth/facebook_authenticator.rb
@@ -13,14 +13,14 @@ class Auth::FacebookAuthenticator < Auth::Authenticator
 
     result.email = email = session_info[:email]
     result.email_valid = true
-    result.name = name = facebook_hash[:name]
+    result.name = facebook_hash[:name]
 
     result.extra_data = facebook_hash
 
     user_info = FacebookUserInfo.where(facebook_user_id: facebook_hash[:facebook_user_id]).first
     result.user = user_info.try(:user)
 
-    if !result.user && result.user = User.where(email: Email.downcase(email)).first
+    if !result.user && !email.blank? && result.user = User.where(email: Email.downcase(email)).first
       FacebookUserInfo.create({user_id: result.user.id}.merge(facebook_hash))
     end