diff --git a/app/assets/javascripts/discourse/controllers/preferences/account.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
index 00aeb2f8f00..9dc6083f15c 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
@@ -10,6 +10,7 @@ export default Ember.Controller.extend(CanCheckEmails, PreferencesTabController,
   saveAttrNames: ['name'],
 
   canEditName: setting('enable_names'),
+  canSaveUser: true,
 
   newNameInput: null,
 
diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/templates/preferences/account.hbs
index 9b851e51ee7..38569dd9bdd 100644
--- a/app/assets/javascripts/discourse/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/account.hbs
@@ -95,11 +95,13 @@
 
 {{plugin-outlet name="user-custom-controls" args=(hash model=model)}}
 
-<div class="control-group save-button">
-  <div class="controls">
-    {{partial 'user/preferences/save-button'}}
+{{#if canSaveUser}}
+  <div class="control-group save-button">
+    <div class="controls">
+      {{partial 'user/preferences/save-button'}}
+    </div>
   </div>
-</div>
+{{/if}}
 
 
 {{#if model.canDeleteAccount}}