diff --git a/static/directives/header-bar.html b/static/directives/header-bar.html
index 1f8ef330b..89959e2da 100644
--- a/static/directives/header-bar.html
+++ b/static/directives/header-bar.html
@@ -11,12 +11,12 @@
 <!-- Collapsable stuff -->
 <div class="collapse navbar-collapse navbar-ex1-collapse">
   <ul class="nav navbar-nav navbar-links">
-    <li ng-if="user.anonymous"><a ng-href="/tour/" target="{{ appLinkTarget() }}">Tour</a></li>
+    <li><a ng-href="/tour/" target="{{ appLinkTarget() }}">Tour</a></li>
     <li><a ng-href="/repository/" target="{{ appLinkTarget() }}">Repositories</a></li>
     <li><a href="http://docs.quay.io/" target="_blank">Docs</a></li>
     <li><a ng-href="/tutorial/" target="{{ appLinkTarget() }}">Tutorial</a></li>
     <li quay-require="['BILLING']"><a ng-href="/plans/" target="{{ appLinkTarget() }}">Pricing</a></li>
-    <li><a ng-href="/organizations/" target="{{ appLinkTarget() }}">Organizations</a></li>
+    <li><a ng-href="{{ user.organizations.length ? '/organizations/' : '/tour/organizations/' }}" target="{{ appLinkTarget() }}">Organizations</a></li>
   </ul>