diff --git a/app/assets/javascripts/discourse/templates/header.js.handlebars b/app/assets/javascripts/discourse/templates/header.js.handlebars
index 50fa5d7f57e..89e24ba4bb1 100644
--- a/app/assets/javascripts/discourse/templates/header.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/header.js.handlebars
@@ -41,12 +41,12 @@
         </div>
       {{/unless}}
       {{#unless currentUser}}
+        <button {{action showCreateAccount}} class='btn btn-primary btn-small sign-up-button'>
+          {{i18n sign_up}}
+        </button>
         <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/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss
index 82b10c3d40f..df5c06e79bd 100644
--- a/app/assets/stylesheets/common/base/header.scss
+++ b/app/assets/stylesheets/common/base/header.scss
@@ -57,7 +57,7 @@
       .fa { margin-right: 3px; }
     }
 
-    button.sign-up-button {
+    button.login-button {
       margin-left: 7px;
     }