diff --git a/app/assets/javascripts/discourse/templates/header.js.handlebars b/app/assets/javascripts/discourse/templates/header.js.handlebars
index 24bc9d0e2f..50fa5d7f57 100644
--- a/app/assets/javascripts/discourse/templates/header.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/header.js.handlebars
@@ -44,6 +44,9 @@
         <button {{action showLogin}} class='btn btn-primary btn-small login-button'>
           {{icon user}} {{i18n log_in}}
         </button>
+        <button {{action showCreateAccount}} class='btn btn-primary btn-small sign-up-button'>
+          {{icon user}} {{i18n sign_up}}
+        </button>
       {{/unless}}
       <ul class='icons clearfix' role='navigation'>
         {{#if currentUser}}
diff --git a/app/assets/javascripts/discourse/templates/modal/create_account.js.handlebars b/app/assets/javascripts/discourse/templates/modal/create_account.js.handlebars
index 7e675b3a33..983b068b6f 100644
--- a/app/assets/javascripts/discourse/templates/modal/create_account.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/modal/create_account.js.handlebars
@@ -80,7 +80,9 @@
     {{#if formSubmitted}}
       &nbsp; <i class='fa fa-spinner fa-spin'></i>
     {{else}}
-      &nbsp; <a {{action showLogin}}>{{i18n cancel}}</a>
+      <button class="btn btn-large" id="login-link" {{action showLogin}}>
+        {{i18n log_in}}
+      </button>
     {{/if}}
   </div>
 {{/unless}}
diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss
index fded897e0f..82b10c3d40 100644
--- a/app/assets/stylesheets/common/base/header.scss
+++ b/app/assets/stylesheets/common/base/header.scss
@@ -50,12 +50,17 @@
         text-overflow: ellipsis;
       }
     }
-    button.login-button {
+    button.login-button, button.sign-up-button {
       float: left;
       margin-top: 7px;
       padding: 6px 10px;
       .fa { margin-right: 3px; }
     }
+
+    button.sign-up-button {
+      margin-left: 7px;
+    }
+
     .icons {
       float: left;
       text-align: center;
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index f8cfd1505c..3be21c68b9 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -97,6 +97,7 @@ en:
     yes_value: "Yes"
     generic_error: "Sorry, an error has occurred."
     generic_error_with_reason: "An error occurred: %{error}"
+    sign_up: "Sign Up"
     log_in: "Log In"
     age: "Age"
     last_post: "Last Post"
diff --git a/test/javascripts/integration/sign-in-test.js.es6 b/test/javascripts/integration/sign-in-test.js.es6
index d706cdfbf5..f933e7a9c5 100644
--- a/test/javascripts/integration/sign-in-test.js.es6
+++ b/test/javascripts/integration/sign-in-test.js.es6
@@ -26,8 +26,7 @@ test("sign in", function() {
 
 test("create account", function() {
   visit("/");
-  click("header .login-button");
-  click('#new-account-link');
+  click("header .sign-up-button");
 
   andThen(function() {
     ok(exists('.create-account'), "it shows the create account modal");