diff --git a/app/assets/javascripts/discourse/templates/user/preferences.hbs b/app/assets/javascripts/discourse/templates/user/preferences.hbs
index 884de102172..4a617f999a3 100644
--- a/app/assets/javascripts/discourse/templates/user/preferences.hbs
+++ b/app/assets/javascripts/discourse/templates/user/preferences.hbs
@@ -145,6 +145,10 @@
       </div>
     </div>
 
+    {{#each uf in userFields}}
+      {{user-field field=uf.field value=uf.value}}
+    {{/each}}
+
     <div class="control-group pref-location">
       <label class="control-label">{{i18n 'user.location'}}</label>
       <div class="controls">
@@ -212,10 +216,6 @@
       {{plugin-outlet "user_custom_preferences"}}
     </div>
 
-    {{#each uf in userFields}}
-      {{user-field field=uf.field value=uf.value}}
-    {{/each}}
-
     <div class="control-group category">
       <label class="control-label">{{i18n 'user.categories_settings'}}</label>
       <div class="controls category-controls">