diff --git a/edivorce/apps/core/templates/base.html b/edivorce/apps/core/templates/base.html
index 35c7dc18..88f4efe0 100644
--- a/edivorce/apps/core/templates/base.html
+++ b/edivorce/apps/core/templates/base.html
@@ -67,12 +67,13 @@
                 <div class="container-fluid">
                     <div class="row">
                         <div class="col-md-5">
-                            {% url 'overview' as overview_url %}
-                            {% if request.bceid_user.is_authenticated and request.path != overview_url %}
-                                <div class="mid_banner-dash"><a href="{{overview_url}}">
+                            {% block backToDashboard %}
+                            {% if request.bceid_user.is_authenticated %}
+                                <div class="mid_banner-dash"><a href="{% url 'overview' %}">
                                     <i class="fa fa-arrow-circle-o-left" aria-hidden="true"></i>Back to Dashboard</a>
                                 </div>
                             {% endif %}
+                            {% endblock %}
                         </div>
                         <div class="col-md-7">
                             {% block sidebarNav %}
diff --git a/edivorce/apps/core/templates/dashboard/check_with_registry.html b/edivorce/apps/core/templates/dashboard/check_with_registry.html
index f4af1a76..c0872bab 100644
--- a/edivorce/apps/core/templates/dashboard/check_with_registry.html
+++ b/edivorce/apps/core/templates/dashboard/check_with_registry.html
@@ -26,6 +26,10 @@
 
 {% endblock %}
 
+{% block backToDashboard %}
+<!-- no back to dashboard -->
+{% endblock %}
+
 {% block formbuttons %}
 <!-- no button -->
 {% endblock %}
diff --git a/edivorce/apps/core/templates/dashboard/file_documents.html b/edivorce/apps/core/templates/dashboard/file_documents.html
index 9c229155..8a0ef16c 100644
--- a/edivorce/apps/core/templates/dashboard/file_documents.html
+++ b/edivorce/apps/core/templates/dashboard/file_documents.html
@@ -22,6 +22,10 @@
 
 {% endblock %}
 
+{% block backToDashboard %}
+<!-- no back to dashboard -->
+{% endblock %}
+
 {% block formbuttons %}
 <!-- no button -->
 {% endblock %}
diff --git a/edivorce/apps/core/templates/dashboard/order_certificate.html b/edivorce/apps/core/templates/dashboard/order_certificate.html
index ec6ff089..2fae3955 100644
--- a/edivorce/apps/core/templates/dashboard/order_certificate.html
+++ b/edivorce/apps/core/templates/dashboard/order_certificate.html
@@ -20,6 +20,10 @@
 </p>
 {% endblock %}
 
+{% block backToDashboard %}
+<!-- no back to dashboard -->
+{% endblock %}
+
 {% block formbuttons %}
 <!-- no button -->
 {% endblock %}
diff --git a/edivorce/apps/core/templates/dashboard/print_form.html b/edivorce/apps/core/templates/dashboard/print_form.html
index 33c97e62..f91e7834 100644
--- a/edivorce/apps/core/templates/dashboard/print_form.html
+++ b/edivorce/apps/core/templates/dashboard/print_form.html
@@ -170,6 +170,10 @@
 
 {% endblock %}
 
+{% block backToDashboard %}
+<!-- no back to dashboard -->
+{% endblock %}
+
 {% block formbuttons %}
 <!-- no button -->
 {% endblock %}
diff --git a/edivorce/apps/core/templates/dashboard/wait.html b/edivorce/apps/core/templates/dashboard/wait.html
index 7e1244aa..c7626072 100644
--- a/edivorce/apps/core/templates/dashboard/wait.html
+++ b/edivorce/apps/core/templates/dashboard/wait.html
@@ -11,6 +11,10 @@
 </p>
 {% endblock %}
 
+{% block backToDashboard %}
+<!-- no back to dashboard -->
+{% endblock %}
+
 {% block formbuttons %}
 <!-- no button -->
 {% endblock %}
diff --git a/edivorce/apps/core/templates/overview.html b/edivorce/apps/core/templates/overview.html
index 8eef136c..765b006d 100644
--- a/edivorce/apps/core/templates/overview.html
+++ b/edivorce/apps/core/templates/overview.html
@@ -98,6 +98,10 @@
 
 {% endblock %}
 
+{% block backToDashboard %}
+<!-- no back to dashboard -->
+{% endblock %}
+
 {% block formbuttons %}
 <!-- no formbuttons -->
 {% endblock %}