diff --git a/hosting/templates/hosting/base_short.html b/hosting/templates/hosting/base_short.html
index f02f4e0c..90208455 100644
--- a/hosting/templates/hosting/base_short.html
+++ b/hosting/templates/hosting/base_short.html
@@ -68,7 +68,7 @@
                             <span class="icon-bar"></span>
                         </button>
                     {% endif %}
-                    <a class="navbar-brand topnav" href="{% if site_url %}{{site_url}}{% else %}{{ request.session.hosting_url}}{% endif %}"><img src="{% static 'datacenterlight/img/logo_black.svg' %}"></a>
+                    <a class="navbar-brand topnav" href="{% url 'datacenterlight:index' %}"><img src="{% static 'datacenterlight/img/logo_black.svg' %}"></a>
                 </div>
                 {% if request.user.is_authenticated %}
                 <!-- Collect the nav links, forms, and other content for toggling -->
diff --git a/hosting/templates/hosting/includes/_navbar_transparent.html b/hosting/templates/hosting/includes/_navbar_transparent.html
index 4efd5920..dec9cd49 100644
--- a/hosting/templates/hosting/includes/_navbar_transparent.html
+++ b/hosting/templates/hosting/includes/_navbar_transparent.html
@@ -1,10 +1,10 @@
 {% load static i18n %}
 
 <nav class="navbar navbar-default  topnav navbar-transparent" role="navigation">
-    <div class="container topnav">
+    <div class="topnav">
         <!-- Brand and toggle get grouped for better mobile display -->
         <div class="navbar-header">
-            <a id="logoWhite" class="navbar-brand topnav" href="{% if site_url %}{{site_url}}{% else %}{{ request.session.hosting_url}}{% endif %}"><img src="{% static 'datacenterlight/img/logo_white.svg' %}"></a>
+            <a id="logoWhite" class="navbar-brand topnav" href="{% url 'datacenterlight:index' %}"><img src="{% static 'datacenterlight/img/logo_white.svg' %}"></a>
         </div>
     </div>
     <!-- /.container -->
diff --git a/hosting/templates/hosting/signup_validate.html b/hosting/templates/hosting/signup_validate.html
index 3ccbe15b..449064dc 100644
--- a/hosting/templates/hosting/signup_validate.html
+++ b/hosting/templates/hosting/signup_validate.html
@@ -1,6 +1,10 @@
 {% extends "hosting/base_short.html" %}
 {% load staticfiles bootstrap3 i18n %}
 
+{% block navbar %}
+    {% include  'hosting/includes/_navbar_transparent.html' %}
+{% endblock navbar %}
+
 {% block content %}
 <div class="auth-container">
    <div class="auth-bg"></div>