diff --git a/lib/auth/result.rb b/lib/auth/result.rb
index 461c8f7c9f5..3c78b2cf5fb 100644
--- a/lib/auth/result.rb
+++ b/lib/auth/result.rb
@@ -46,15 +46,18 @@ class Auth::Result
         }
       end
     else
-      {
-        email: email,
-        name:  User.suggest_name(name || username || email),
-        username: UserNameSuggester.suggest(username || name || email),
-        # this feels a tad wrong
-        auth_provider: authenticator_name.capitalize,
-        email_valid: !!email_valid,
-        omit_username: !!omit_username
-      }
+      result = { email: email,
+                 username: UserNameSuggester.suggest(username || name || email),
+                 # this feels a tad wrong
+                 auth_provider: authenticator_name.capitalize,
+                 email_valid: !!email_valid,
+                 omit_username: !!omit_username }
+
+      if SiteSetting.enable_names?
+        result[:name] = User.suggest_name(name || username || email)
+      end
+
+      result
     end
   end
 end