diff --git a/app/assets/javascripts/discourse/controllers/preferences.js.es6 b/app/assets/javascripts/discourse/controllers/preferences.js.es6
index d8fdd6c10d3..b1841128b5e 100644
--- a/app/assets/javascripts/discourse/controllers/preferences.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences.js.es6
@@ -35,6 +35,10 @@ export default Discourse.ObjectController.extend({
     return Discourse.SiteSettings.enable_badges && this.get('model.has_title_badges');
   }.property('model.badge_count'),
 
+  canChangePassword: function() {
+    return !Discourse.SiteSettings.enable_sso && Discourse.SiteSettings.enable_local_logins;
+  }.property(),
+
   availableLocales: function() {
     return Discourse.SiteSettings.available_locales.split('|').map( function(s) {
       return {name: s, value: s};
diff --git a/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars b/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars
index a81ee7b3e61..1d683ba80e4 100644
--- a/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars
@@ -60,7 +60,7 @@
       </div>
     </div>
 
-    {{#unless Discourse.SiteSettings.enable_sso }}
+    {{#if canChangePassword}}
     <div class="control-group pref-password">
       <label class="control-label">{{i18n user.password.title}}</label>
       <div class="controls">
@@ -74,7 +74,7 @@
         {{passwordProgress}}
       </div>
     </div>
-    {{/unless}}
+    {{/if}}
 
     <div class="control-group pref-avatar">
       <label class="control-label">{{i18n user.avatar.title}}</label>