diff --git a/app/assets/javascripts/discourse/controllers/static.js.es6 b/app/assets/javascripts/discourse/controllers/static.js.es6
index 16b4d731e..a1c4ab9dd 100644
--- a/app/assets/javascripts/discourse/controllers/static.js.es6
+++ b/app/assets/javascripts/discourse/controllers/static.js.es6
@@ -1,6 +1,16 @@
+import computed from 'ember-addons/ember-computed-decorators';
+
 export default Ember.Controller.extend({
+
+  needs: ['application'],
+
   showLoginButton: Em.computed.equal("model.path", "login"),
 
+  @computed("model.path")
+  showSignupButton() {
+    return this.get("model.path") === "login" && this.get('controllers.application.canSignUp');
+  },
+
   actions: {
     markFaqRead() {
       const currentUser = this.currentUser;
diff --git a/app/assets/javascripts/discourse/templates/static.hbs b/app/assets/javascripts/discourse/templates/static.hbs
index f41c71808..91662eb33 100644
--- a/app/assets/javascripts/discourse/templates/static.hbs
+++ b/app/assets/javascripts/discourse/templates/static.hbs
@@ -3,8 +3,12 @@
     {{plugin-outlet "above-static"}}
     {{{model.html}}}
 
+    {{#if showSignupButton}}
+      {{d-button action="showCreateAccount" class="btn-primary sign-up-button" label="sign_up"}}
+    {{/if}}
+
     {{#if showLoginButton}}
-    <button class="btn btn-primary" {{action "showLogin"}}>{{fa-icon "user"}}{{i18n 'log_in'}}</button>
+      {{d-button action="showLogin" class="btn-primary login-button" icon="user" label="log_in"}}
     {{/if}}
   </div>
 </div>