diff --git a/app/assets/javascripts/discourse/controllers/create-account.js.es6 b/app/assets/javascripts/discourse/controllers/create-account.js.es6
index 9ff65be6285..45e7d7bc955 100644
--- a/app/assets/javascripts/discourse/controllers/create-account.js.es6
+++ b/app/assets/javascripts/discourse/controllers/create-account.js.es6
@@ -67,6 +67,10 @@ export default Ember.Controller.extend(ModalFunctionality, {
 
   usernameRequired: Ember.computed.not('authOptions.omit_username'),
 
+  fullnameRequired: function() {
+    return this.get('siteSettings.full_name_required') || this.get('siteSettings.enable_names');
+  }.property(),
+
   passwordRequired: function() {
     return Ember.isEmpty(this.get('authOptions.auth_provider'));
   }.property('authOptions.auth_provider'),
diff --git a/app/assets/javascripts/discourse/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
index 5e5d9b497bd..ca5485a2711 100644
--- a/app/assets/javascripts/discourse/templates/modal/create-account.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
@@ -35,7 +35,7 @@
           </tr>
         {{/if}}
 
-        {{#if siteSettings.enable_names}}
+        {{#if fullnameRequired}}
           <tr class="input">
             <td style="width:80px" class="label">
               <label for='new-account-name'>{{i18n 'user.name.title'}}</label>