diff --git a/app/layout/header/header.jade b/app/layout/header/header.jade
index 3bf6a6946..05785a9e9 100644
--- a/app/layout/header/header.jade
+++ b/app/layout/header/header.jade
@@ -11,12 +11,16 @@
       button.btn-close-menu(type="button", ng-if="main.menuVisible", ng-click="main.menuVisible = false")
 
       // User link (profile or join)
-      a(ui-sref="profile.about({userHandle: vm.userHandle})", ng-switch="vm.isAuth" class="user-link" data-ng-if="!main.menuVisible")
-        img(ng-switch-when="true", ng-if="vm.profile.photoURL && vm.profile.photoURL.length", class="user-avatar", ng-src="{{vm.profile.photoURL}}")
+      div.user-link(data-ng-if="!main.menuVisible")
+        a(ui-sref="profile.about({userHandle: vm.userHandle})", ng-if="vm.isAuth")
+          img(ng-if="vm.profile.photoURL && vm.profile.photoURL.length", class="user-avatar", ng-src="{{vm.profile.photoURL}}")
 
-        img(ng-switch-when="true", ng-if="!vm.profile.photoURL || !vm.profile.photoURL.length", class="user-avatar", ng-src=require("../../../assets/images/ico-user-default.svg"))
+          img(ng-if="!vm.profile.photoURL || !vm.profile.photoURL.length", class="user-avatar", ng-src=require("../../../assets/images/ico-user-default.svg"))
+
+        a.tc-btn.tc-btn-s.btn-link(ui-sref="register", ng-if="!vm.isAuth") JOIN
+
+        a.tc-btn.tc-btn-s.tc-btn-ghost.btn-link(ui-sref="login", ng-if="!vm.isAuth") LOG IN
 
-        span(ng-switch-when="false" class="tc-btn tc-btn-s") JOIN
 
     ul.main-menu
       li.menu-item.search-wrapper
diff --git a/assets/css/layout/header.scss b/assets/css/layout/header.scss
index 5a5c7a11f..f5bdcf22b 100644
--- a/assets/css/layout/header.scss
+++ b/assets/css/layout/header.scss
@@ -88,6 +88,10 @@
   right: 10px;
   top: 0;
   text-decoration: none;
+
+  a + a {
+    margin-left: 12px;
+  }
 }
 
 .btn-link {