diff --git a/bornhack/templates/base.html b/bornhack/templates/base.html
index 7166e652..0a8a2b17 100644
--- a/bornhack/templates/base.html
+++ b/bornhack/templates/base.html
@@ -55,13 +55,13 @@
             {% endif %}
 
             {% endif %}
+            <li><a href="{% url 'call-for-speakers' %}">Speakers</a></li>
+            <li><a href="{% url 'call-for-sponsors' %}">Sponsors</a></li>
             <li><a href="{% url 'contact' %}">Contact</a></li>
             {% if user.is_authenticated %}
             <li><a href="{% url 'profiles:detail' %}">Profile</a></li>
-            <li><a href="{% url 'account_logout' %}">Logout</a></li>
             {% else %}
             <li><a href="{% url 'account_login' %}">Login</a></li>
-            <li><a href="{% url 'account_signup' %}">Sign up</a></li>
             {% endif %}
           </ul>
         </div>
diff --git a/profiles/templates/profiles/profile_base.html b/profiles/templates/profiles/profile_base.html
index c0f01798..bdf46633 100644
--- a/profiles/templates/profiles/profile_base.html
+++ b/profiles/templates/profiles/profile_base.html
@@ -13,6 +13,9 @@
         <a href="{% url 'account_email' %}" class="btn btn-black">
           Manage emails
         </a>
+        <a href="{% url 'account_logout' %}" class="btn btn-black">
+          Logout
+        </a>
 
         {% if user.is_authenticated and user.orders.exists %}
       <a href="{% url 'shop:order_list' %}" class="btn btn-black">