diff --git a/app/assets/javascripts/discourse/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
index 8b4ead4a8..d3b005267 100644
--- a/app/assets/javascripts/discourse/templates/modal/create-account.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
@@ -35,17 +35,20 @@
           </tr>
         {{/if}}
 
-        <tr class="input">
-            <td style="width:80px" class="label"><label for='new-account-name'>{{i18n 'user.name.title'}}</label></td>
-            <td style="width:496px">
-                {{text-field value=accountName id="new-account-name"}}
-                &nbsp;{{input-tip validation=nameValidation}}
+        {{#if siteSettings.enable_names}}
+          <tr class="input">
+            <td style="width:80px" class="label">
+              <label for='new-account-name'>{{i18n 'user.name.title'}}</label>
             </td>
-        </tr>
-        <tr class="instructions">
+            <td style="width:496px">
+              {{text-field value=accountName id="new-account-name"}}&nbsp;{{input-tip validation=nameValidation}}
+            </td>
+          </tr>
+          <tr class="instructions">
             <td></td>
             <td><label>{{nameInstructions}}</label></td>
-        </tr>
+          </tr>
+        {{/if}}
 
         {{#if passwordRequired}}
           <tr class="input">