diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 4fb12d9..2675c15 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -333,12 +333,6 @@ table {
   min-height: 100px;
 }
 
-.navbar-gitlab .navbar-inner .nav > li .btn-sign-in {
-  @extend .btn-new;
-  padding: 5px 15px;
-  text-shadow: none;
-}
-
 .broadcast-message {
   padding: 10px;
   text-align: center;
@@ -390,3 +384,9 @@ table {
     margin-bottom: 15px;
   }
 }
+
+.btn-sign-in {
+  margin-top: 7px;
+  text-shadow: none;
+}
+
diff --git a/app/views/layouts/_public_head_panel.html.haml b/app/views/layouts/_public_head_panel.html.haml
index 3c4bd85..7d188fb 100644
--- a/app/views/layouts/_public_head_panel.html.haml
+++ b/app/views/layouts/_public_head_panel.html.haml
@@ -12,11 +12,12 @@
         - else
           Public Projects
 
-      %ul.nav
+      .pull-right
+        = link_to "Sign in", new_session_path(:user), class: 'btn btn-sign-in btn-new'
+
+      %ul.nav.navbar-nav
         %li
           %a
             %div.hide.turbolink-spinner
               %i.icon-refresh.icon-spin
               Loading...
-        %li
-          = link_to "Sign in", new_session_path(:user), class: 'btn btn-sign-in'
diff --git a/lib/gitlab/theme.rb b/lib/gitlab/theme.rb
index 8960416..44237a0 100644
--- a/lib/gitlab/theme.rb
+++ b/lib/gitlab/theme.rb
@@ -15,7 +15,7 @@ module Gitlab
         COLOR  => "ui_color"
       }
 
-      id ||= 1
+      id ||= Gitlab.config.gitlab.default_theme
 
       return themes[id]
     end
--
libgit2 0.21.2