diff --git a/app/assets/javascripts/discourse/components/login-buttons.js.es6 b/app/assets/javascripts/discourse/components/login-buttons.js.es6
index ccaabff239f..4c68d1740f2 100644
--- a/app/assets/javascripts/discourse/components/login-buttons.js.es6
+++ b/app/assets/javascripts/discourse/components/login-buttons.js.es6
@@ -1,4 +1,5 @@
 import { findAll }  from 'discourse/models/login-method';
+import computed from 'ember-addons/ember-computed-decorators';
 
 export default Ember.Component.extend({
   elementId: 'login-buttons',
@@ -6,9 +7,10 @@ export default Ember.Component.extend({
 
   hidden: Ember.computed.equal('buttons.length', 0),
 
-  buttons: function() {
-    return findAll(this.siteSettings);
-  }.property(),
+  @computed
+  buttons() {
+    return findAll(this.siteSettings, this.capabilities, this.site.isMobileDevice);
+  },
 
   actions: {
     externalLogin: function(provider) {