diff --git a/app/main/views/templates.py b/app/main/views/templates.py
index b638d69fe..037e6fd4f 100644
--- a/app/main/views/templates.py
+++ b/app/main/views/templates.py
@@ -14,12 +14,29 @@ def manage_templates(service_id):
     )
 
 
-@main.route("/services/<int:service_id>/templates/template", methods=['GET', 'POST'])
+@main.route("/services/<int:service_id>/templates/add", methods=['GET', 'POST'])
 @login_required
 def add_template(service_id):
 
     form = TemplateForm()
 
+    if request.method == 'GET':
+        return render_template(
+            'views/edit-template.html',
+            h1='Add template',
+            form=form,
+            service_id=service_id
+        )
+    elif request.method == 'POST':
+        return redirect(url_for('.manage_templates', service_id=service_id))
+
+
+@main.route("/services/<int:service_id>/templates/<template_id>", methods=['GET', 'POST'])
+@login_required
+def edit_template(service_id, template_id):
+
+    form = TemplateForm()
+
     form.template_name.data = 'Reminder'
     form.template_body.data = 'Vehicle tax: Your vehicle tax for ((registration number)) expires on ((date)). Tax your vehicle at www.gov.uk/vehicle-tax'  # noqa
 
@@ -32,20 +49,3 @@ def add_template(service_id):
         )
     elif request.method == 'POST':
         return redirect(url_for('.manage_templates', service_id=service_id))
-
-
-@main.route("/services/<int:service_id>/templates/template/add", methods=['GET', 'POST'])
-@login_required
-def edit_template(service_id):
-
-    form = TemplateForm()
-
-    if request.method == 'GET':
-        return render_template(
-            'views/edit-template.html',
-            h1='Add template',
-            form=form,
-            service_id=service_id
-        )
-    elif request.method == 'POST':
-        return redirect(url_for('.manage_templates', service_id=service_id))
diff --git a/app/templates/views/job.html b/app/templates/views/job.html
index fa37dfdc4..e0750ecbd 100644
--- a/app/templates/views/job.html
+++ b/app/templates/views/job.html
@@ -38,7 +38,7 @@ GOV.UK Notify | Notifications activity
 		</ul>
 
     <p>
-      Sent with template <a href="{{ url_for('.edit_template', service_id=service_id) }}">{{ template_used }}</a> at {{ uploaded_file_time }}
+      Sent with template <a href="{{ url_for('.edit_template', service_id=service_id, template_id=1) }}">{{ template_used }}</a> at {{ uploaded_file_time }}
     </p>
 
     {% call(item) list_table(
diff --git a/app/templates/views/manage-templates.html b/app/templates/views/manage-templates.html
index 8086dec21..37bfa41fc 100644
--- a/app/templates/views/manage-templates.html
+++ b/app/templates/views/manage-templates.html
@@ -12,11 +12,11 @@ GOV.UK Notify | Manage templates
     <p>Here's where you can view templates, choose to add one, or edit/delete one.</p>
 
     <p>
-      <a href="{{ url_for('.edit_template', service_id=service_id) }}">Here is my first template</a>
+      <a href="{{ url_for('.edit_template', service_id=service_id, template_id=1) }}">Here is my first template</a>
     </p>
 
     <p>
-      <a class="button" href="{{ url_for('.edit_template', service_id=service_id) }}" role="button">Add a new message template</a>
+      <a class="button" href="{{ url_for('.add_template', service_id=service_id) }}" role="button">Add a new message template</a>
     </p>