diff --git a/gnuviechadmin/templates/base.html b/gnuviechadmin/templates/base.html
index ed85c4f..e726ef9 100644
--- a/gnuviechadmin/templates/base.html
+++ b/gnuviechadmin/templates/base.html
@@ -50,15 +50,12 @@
           </ul>
           <ul class="nav navbar-nav navbar-right">
             {% if user.is_authenticated %}
-            {% user_display user as user_display %}
-            {% url 'user_profile' slug=user.username as profile_url %}
-            <p class="navbar-text">{% blocktrans %}Signed in as <a href="{{ profile_url }}" class="navbar-link" title="My Profile">{{ user_display }}</a>{% endblocktrans %}</p>
             <li class="dropdown">
               <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">{% trans "My Account" %} <span class="caret"></span></a>
               <ul class="dropdown-menu" role="menu">
-              {% if user.is_staff %}<li><a href="{% url 'admin:index' %}">{% trans "Admin site" %}</a></li>{% endif %}
-              <li><a href="{% url 'account_email' %}">{% trans "Change Email" %}</a></li>
-              <li><a href="{% url 'account_logout' %}">{% trans "Logout" %}</a></li>
+                {% if user.is_staff %}<li><a href="{% url 'admin:index' %}">{% trans "Admin site" %}</a></li>{% endif %}
+                <li><a href="{% url 'account_email' %}">{% trans "Change Email" %}</a></li>
+                <li><a href="{% url 'account_logout' %}">{% trans "Logout" %}</a></li>
               </ul>
             </li>
             {% else %}
@@ -66,6 +63,11 @@
             <li><a href="{% url 'account_signup' %}">{% trans "Sign Up" %}</a></li>
             {% endif %}
           </ul>
+          {% if user.is_authenticated %}
+          {% user_display user as user_display %}
+          {% url 'user_profile' slug=user.username as profile_url %}
+          <p class="navbar-text navbar-right">{% blocktrans %}Signed in as <a href="{{ profile_url }}" class="navbar-link" title="My Profile">{{ user_display }}</a>{% endblocktrans %}</p>
+          {% endif %}
         </div><!--/.nav-collapse -->
       </div>
     </div>