diff --git a/app/assets/javascripts/discourse/controllers/invites-show.js.es6 b/app/assets/javascripts/discourse/controllers/invites-show.js.es6
index 20e533ec0c5..15acf96dddd 100644
--- a/app/assets/javascripts/discourse/controllers/invites-show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/invites-show.js.es6
@@ -38,6 +38,11 @@ export default Ember.Controller.extend(PasswordValidation, UsernameValidation, N
     return usernameFailed || passwordFailed || nameFailed || userFieldsFailed;
   },
 
+  @computed
+  fullnameRequired() {
+    return this.siteSettings.full_name_required || this.siteSettings.enable_names;
+  },
+
   actions: {
     submit() {
 
diff --git a/app/assets/javascripts/discourse/templates/invites/show.hbs b/app/assets/javascripts/discourse/templates/invites/show.hbs
index ade57c9d262..65c775087b6 100644
--- a/app/assets/javascripts/discourse/templates/invites/show.hbs
+++ b/app/assets/javascripts/discourse/templates/invites/show.hbs
@@ -30,11 +30,13 @@
             <div class="instructions">{{i18n 'user.username.instructions'}}</div>
           </div>
 
-          <div class="input name-input">
-            <label>{{i18n 'invites.name_label'}}</label>
-            {{input value=accountName id="new-account-name" name="name"}}
-            <div class="instructions">{{nameInstructions}}</div>
-          </div>
+          {{#if fullnameRequired}}
+            <div class="input name-input">
+              <label>{{i18n 'invites.name_label'}}</label>
+              {{input value=accountName id="new-account-name" name="name"}}
+              <div class="instructions">{{nameInstructions}}</div>
+            </div>
+          {{/if}}
 
           <div class="input password-input">
             <label>{{i18n 'invites.password_label'}}</label>