diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py
index 3e2897d98..bf0197ceb 100644
--- a/app/main/views/service_settings.py
+++ b/app/main/views/service_settings.py
@@ -70,6 +70,8 @@ def service_name_change_confirm(service_id):
     if form.validate_on_submit():
         service['name'] = session['service_name_change']
         update_service(service)
+        session['service_name'] = service['name']
+        session.pop('service_name_change')
         return redirect(url_for('.service_settings', service_id=service_id))
     return render_template(
         'views/service-settings/confirm.html',
diff --git a/app/main/views/templates.py b/app/main/views/templates.py
index a40d3b8f2..ead3747e6 100644
--- a/app/main/views/templates.py
+++ b/app/main/views/templates.py
@@ -1,4 +1,4 @@
-from flask import request, render_template, redirect, url_for, flash
+from flask import request, render_template, redirect, url_for, flash, abort
 from flask_login import login_required
 
 from app.main import main
diff --git a/app/templates/views/job.html b/app/templates/views/job.html
index 3ec59026b..60851b08b 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_service_template', service_id=service_id, template_id=1) }}">{{ template_used }}</a> on {{ uploaded_file_time | format_datetime}}
+      Sent with template <a href="{{ url_for('.edit_service_template', service_id=service_id, template_id=template_used) }}">{{ template_used }}</a> on {{ uploaded_file_time | format_datetime}}
     </p>
 
     {% call(item) list_table(
diff --git a/app/templates/views/service-settings/confirm.html b/app/templates/views/service-settings/confirm.html
index 378600f54..5f10e9c45 100644
--- a/app/templates/views/service-settings/confirm.html
+++ b/app/templates/views/service-settings/confirm.html
@@ -13,7 +13,7 @@ GOV.UK Notify | Service settings
   <div class="grid-row">
     <div class="column-three-quarters">
 
-    <form method="post">
+    <form autocomplete="off" method="post">
       {{ textbox(form.password) }}
       {{ page_footer(
         'Confirm',