diff --git a/app/templates/views/choose-template.html b/app/templates/views/choose-template.html
index 1b97ad899..2d0b56551 100644
--- a/app/templates/views/choose-template.html
+++ b/app/templates/views/choose-template.html
@@ -15,6 +15,10 @@
     <h1 class="heading-large">{{ page_heading }}</h1>
 
     {% if current_user.has_permissions(permissions=['manage_templates'], any_=True) %}
+       <p class="bottom-gutter">
+         You need a template before you can send
+         {{ 'emails' if 'email' == template_type else 'text messages' }}
+       </p>
       <a href="{{ url_for('.add_service_template', service_id=service_id, template_type=template_type) }}" class="button">Add a new template</a>
     {% else %}
       <p>You need to ask your service manager to add templates before you can send messages</p>
diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html
index bdf9c1838..4fe589ed5 100644
--- a/app/templates/views/dashboard/dashboard.html
+++ b/app/templates/views/dashboard/dashboard.html
@@ -10,12 +10,11 @@
     {% include 'views/dashboard/trial-mode-banner.html' %}
   {% endif %}
 
-  {% if not jobs %}
-    {% if current_user.has_permissions(['manage_templates','send_texts', 'send_emails', 'send_letters']) %}
-      {% include 'views/dashboard/get-started.html' %}
-    {% endif%}
-  {% else %}
+  {% if not templates and current_user.has_permissions(['send_texts', 'send_emails', 'send_letters'], any_=True) %}
+    {% include 'views/dashboard/get-started.html' %}
+  {% endif %}
 
+  {% if templates %}
     <div
       data-module="update-content"
       data-resource="{{url_for(".service_dashboard_updates", service_id=service_id)}}"
diff --git a/app/templates/views/dashboard/get-started.html b/app/templates/views/dashboard/get-started.html
index d1b8adc01..a2fa514d1 100644
--- a/app/templates/views/dashboard/get-started.html
+++ b/app/templates/views/dashboard/get-started.html
@@ -1,19 +1,30 @@
 {% from "components/banner.html" import banner_wrapper %}
 
 <h2 class="heading-medium">Get started</h2>
-<ol class="grid-row">
-  {% if current_user.has_permissions(['manage_templates']) %}
+{% if current_user.has_permissions(['manage_templates']) %}
+  <p>
+    You need to set up a template before you can send messages
+  </p>
+  <ol class="grid-row">
     <li class="column-half">
-      {% call banner_wrapper(type="tip", subhead='1.' if not templates else None, with_tick=templates|length) %}
-        <a href='{{ url_for(".add_service_template", service_id=service_id, template_type="sms") }}'>Add a template</a>
+      {% call banner_wrapper(type="tip") %}
+        <a href='{{ url_for(".add_service_template", service_id=service_id, template_type="sms") }}' style="white-space: nowrap;">
+          Set up a text message template
+        </a>
       {% endcall %}
     </li>
-  {% endif %}
-  {% if current_user.has_permissions(['send_texts', 'send_emails', 'send_letters']) %}
     <li class="column-half">
-      {% call banner_wrapper(type="tip", subhead='2.') %}
-        <a href='{{ url_for(".choose_template", service_id=service_id, template_type="sms") }}'>Send yourself a message</a>
+      {% call banner_wrapper(type="tip") %}
+        <a href='{{ url_for(".add_service_template", service_id=service_id, template_type="email") }}'>
+          Set up an email template
+        </a>
       {% endcall %}
     </li>
-  {% endif %}
-</ol>
+  </ol>
+{% else %}
+  <p>
+    <p>
+      You need to ask your service manager to set up some templates before you can send messages
+    </p>
+  </p>
+{% endif %}
diff --git a/app/templates/views/service_dashboard.html b/app/templates/views/service_dashboard.html
deleted file mode 100644
index de2d7992a..000000000
--- a/app/templates/views/service_dashboard.html
+++ /dev/null
@@ -1,76 +0,0 @@
-{% extends "withnav_template.html" %}
-{% from "components/banner.html" import banner_wrapper %}
-{% from "components/table.html" import list_table, field, right_aligned_field_heading %}
-{% from "components/big-number.html" import big_number %}
-
-{% block page_title %}
-  {{ session.get('service_name', 'Dashboard') }} – GOV.UK Notify
-{% endblock %}
-
-{% block maincolumn_content %}
-
-    <ul class="grid-row job-totals">
-      <li class="column-half">
-        {{ big_number(
-          free_text_messages_remaining,
-          'free text messages remaining'
-        )}}
-      </li>
-      <li class="column-half">
-        {{ big_number(
-          '£' + spent_this_month,
-          'spent this month'
-        )}}
-      </li>
-    </ul>
-
-    {% if not template_count and not jobs %}
-      {% if current_user.has_permissions(['manage_templates', 'send_texts', 'send_emails', 'send_letters'], any_=True, admin_override=True) %}
-        {% call banner_wrapper(subhead='Get started', type="tip") %}
-          <ol>
-            {% if current_user.has_permissions(['manage_templates'], admin_override=True) %}
-              <li>
-                <a href='{{ url_for(".add_service_template", service_id=service_id, template_type="sms") }}'>Add a template</a>
-              </li>
-            {% endif %}
-            {% if current_user.has_permissions(['send_texts']) %}
-              <li>
-                <a href='{{ url_for(".choose_template", service_id=service_id, template_type="sms") }}'>Send yourself a text message</a>
-              </li>
-            {% endif %}
-          </ol>
-        {% endcall %}
-      {% endif %}
-    {% elif not jobs %}
-      {% call banner_wrapper(subhead='Next step', type="tip") %}
-        {% if current_user.has_permissions(permissions=['send_texts', 'send_emails', 'send_letters']) %}
-          <a href='{{ url_for(".choose_template", service_id=service_id, template_type="sms") }}'>Send yourself a text message</a>
-        {% endif %}
-      {% endcall %}
-    {% else %}
-      {% call(item) list_table(
-        jobs,
-        caption="Recent text messages",
-        empty_message='You haven’t sent any batch messages yet',
-        field_headings=['Job', 'Created', right_aligned_field_heading('completion')]
-      ) %}
-        {% call field() %}
-          <a href="{{ url_for('.view_job', service_id=service_id, job_id=item.id) }}">{{ item.original_file_name }}</a>
-        {% endcall %}
-        {% call field() %}
-          {{ item.created_at|format_datetime }}
-        {% endcall %}
-        {% call field(align='right') %}
-          {{ (item.notifications_sent / item.notification_count * 100)|round|int }}%
-        {% endcall %}
-      {% endcall %}
-      {% if more_jobs_to_show %}
-        {% if current_user.has_permissions(permissions=['send_texts', 'send_emails', 'send_letters']) %}
-          <p class="table-show-more-link">
-            <a href="{{ url_for('.view_notifications', service_id=service_id) }}">See all sent batch messages</a>
-          </p>
-        {% endif %}
-      {% endif %}
-    {% endif %}
-
-{% endblock %}