diff --git a/lib/gitlab/oauth/user.rb b/lib/gitlab/oauth/user.rb
index 1bac93378ef9c9d8f7ef2810de48570b8735801d..c6f56c141e58decdb12973d26225adbbb8ad4bd3 100644
--- a/lib/gitlab/oauth/user.rb
+++ b/lib/gitlab/oauth/user.rb
@@ -65,7 +65,11 @@ module Gitlab
         end
 
         def name
-          auth.info.name.to_s.force_encoding("utf-8")
+          unless auth.info.name.nil?
+            auth.info.name.to_s.force_encoding("utf-8")
+          else
+            "#{auth.info.first_name} #{auth.info.last_name}".force_encoding("utf-8")
+          end
         end
 
         def username