diff --git a/lib/multiauth_support.rb b/lib/multiauth_support.rb
index acdd8511f..d57cf3793 100644
--- a/lib/multiauth_support.rb
+++ b/lib/multiauth_support.rb
@@ -68,6 +68,11 @@ def authenticate(fields)
           end
         end
 
+        # To handle: Facebook login issue
+        if user.password.blank? && provider =~ /facebook|Facebook/
+          user.password = Devise.friendly_token[0,20]
+        end
+
         if !user.valid? && !user.errors[:login].empty?
           user.login = user.login + "_#{rand(100)}#{rand(100)}#{rand(100)}"
         end