diff --git a/opentech/apply/users/templates/users/account.html b/opentech/apply/users/templates/users/account.html
index 71b4b9e375743f610e5f2dff846705f861b96a92..51b919fa62b5eb447aa7d42a01938cf851777d58 100644
--- a/opentech/apply/users/templates/users/account.html
+++ b/opentech/apply/users/templates/users/account.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'base-apply.html' %}
 {% load i18n users_tags %}
 
 {% block title %}Account{% endblock %}
diff --git a/opentech/templates/base-apply.html b/opentech/templates/base-apply.html
index 9bdf32fde254ad0c96789ef0442885cc1ea1371d..bf0fffc2537f5b7916fb48ef3973ece0183097f9 100644
--- a/opentech/templates/base-apply.html
+++ b/opentech/templates/base-apply.html
@@ -74,9 +74,9 @@
                 </section>
 
                 <div class="header__button-container">
-                    <a href="#" class="button button--transparent button--narrow button--contains-icons">
+                    <a href="{% url 'users:account' %}" class="button button--transparent button--narrow button--contains-icons">
                         <svg class="icon icon--person"><use xlink:href="#person-icon"></use></svg>
-                        Joe Bloggs
+                        {{ request.user }}
                     </a>
                     <a href="{% url 'users:logout' %}" class="button button--transparent button--narrow">
                         Log Out