diff --git a/app/__init__.py b/app/__init__.py
index 1267b23d3..3f3a1b6e0 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -3,7 +3,15 @@ import re
 
 import dateutil
 import urllib
-from flask import (Flask, session, Markup, escape, render_template, make_response, current_app)
+from flask import (
+    Flask,
+    session,
+    Markup,
+    escape,
+    render_template,
+    make_response,
+    current_app,
+    request)
 from flask._compat import string_types
 from flask_login import LoginManager
 from flask_wtf import CsrfProtect
@@ -27,6 +35,10 @@ from utils.recipients import validate_phone_number, InvalidPhoneError
 import app.proxy_fix
 from config import configs
 from utils import logging
+from werkzeug.local import LocalStack, LocalProxy
+from flask.globals import _lookup_req_object
+from functools import partial
+
 
 login_manager = LoginManager()
 csrf = CsrfProtect()
@@ -41,6 +53,9 @@ invite_api_client = InviteApiClient()
 statistics_api_client = StatisticsApiClient()
 asset_fingerprinter = AssetFingerprinter()
 
+# The current service attached to the request stack.
+current_service = LocalProxy(partial(_lookup_req_object, 'service'))
+
 
 def create_app():
     application = Flask(__name__)
@@ -82,6 +97,12 @@ def create_app():
     application.add_template_filter(linkable_name)
 
     application.after_request(useful_headers_after_request)
+    application.after_request(save_service_after_request)
+    application.before_request(load_service_before_request)
+
+    def _attach_current_service():
+        return {'current_service': current_service}
+    application.context_processor(_attach_current_service)
     register_errorhandlers(application)
 
     return application
@@ -167,7 +188,26 @@ def load_user(user_id):
     return user_api_client.get_user(user_id)
 
 
-# https://www.owasp.org/index.php/List_of_useful_HTTP_headers
+def load_service_before_request():
+    service_id = request.view_args.get('service_id', None) if request.view_args else None
+    if service_id:
+        from flask.globals import _request_ctx_stack
+        if _request_ctx_stack.top is not None:
+            setattr(
+                _request_ctx_stack.top,
+                'service',
+                service_api_client.get_service(service_id)['data'])
+
+
+def save_service_after_request(response):
+    # Only save the current session if the request is 200
+    service_id = request.view_args.get('service_id', None) if request.view_args else None
+    if response.status_code == 200 and service_id:
+        session['service_id'] = service_id
+    return response
+
+
+#  https://www.owasp.org/index.php/List_of_useful_HTTP_headers
 def useful_headers_after_request(response):
     response.headers.add('X-Frame-Options', 'deny')
     response.headers.add('X-Content-Type-Options', 'nosniff')
diff --git a/app/main/views/add_service.py b/app/main/views/add_service.py
index 3ef20c86b..471058d44 100644
--- a/app/main/views/add_service.py
+++ b/app/main/views/add_service.py
@@ -35,9 +35,8 @@ def add_service():
     form = AddServiceForm(service_api_client.find_all_service_email_from)
     heading = 'Which service do you want to set up notifications for?'
     if form.validate_on_submit():
-        session['service_name'] = form.name.data
-        email_from = email_safe(session['service_name'])
-        service_id = service_api_client.create_service(service_name=session['service_name'],
+        email_from = email_safe(form.name.data)
+        service_id = service_api_client.create_service(service_name=form.name.data,
                                                        active=False,
                                                        limit=current_app.config['DEFAULT_SERVICE_LIMIT'],
                                                        restricted=True,
diff --git a/app/main/views/api_keys.py b/app/main/views/api_keys.py
index 0ee7b2220..4d992c249 100644
--- a/app/main/views/api_keys.py
+++ b/app/main/views/api_keys.py
@@ -17,7 +17,6 @@ def documentation():
 def api_keys(service_id):
     return render_template(
         'views/api-keys.html',
-        service_id=service_id,
         keys=api_key_api_client.get_api_keys(service_id=service_id)['apiKeys']
     )
 
@@ -32,11 +31,10 @@ def create_api_key(service_id):
     form = CreateKeyForm(key_names)
     if form.validate_on_submit():
         secret = api_key_api_client.create_api_key(service_id=service_id, key_name=form.key_name.data)
-        return render_template('views/api-keys/show.html', service_id=service_id, secret=secret,
+        return render_template('views/api-keys/show.html', secret=secret,
                                key_name=form.key_name.data)
     return render_template(
         'views/api-keys/create.html',
-        service_id=service_id,
         key_name=form.key_name
     )
 
@@ -49,7 +47,6 @@ def revoke_api_key(service_id, key_id):
     if request.method == 'GET':
         return render_template(
             'views/api-keys/revoke.html',
-            service_id=service_id,
             key_name=key_name
         )
     elif request.method == 'POST':
diff --git a/app/main/views/choose_service.py b/app/main/views/choose_service.py
index 23a3a80ff..657e6ab22 100644
--- a/app/main/views/choose_service.py
+++ b/app/main/views/choose_service.py
@@ -23,4 +23,7 @@ def show_all_services_or_dashboard():
     if 1 == len(services):
         return redirect(url_for('.service_dashboard', service_id=services[0]['id']))
     else:
+        service_id = session.get('service_id', None)
+        if any([service_id == x['id'] for x in services]):
+            return redirect(url_for('.service_dashboard', service_id=service_id))
         return redirect(url_for('.choose_service'))
diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py
index 5deafee07..2fbb4c04f 100644
--- a/app/main/views/dashboard.py
+++ b/app/main/views/dashboard.py
@@ -2,13 +2,14 @@ from flask import (
     render_template,
     session,
     flash,
-    jsonify
+    jsonify,
+    request
 )
 from datetime import date
 
 from flask_login import login_required
 from app.main import main
-from app import (job_api_client, statistics_api_client, service_api_client)
+from app import (job_api_client, statistics_api_client, service_api_client, current_service)
 from app.utils import user_has_permissions
 
 
@@ -19,14 +20,10 @@ def service_dashboard(service_id):
     templates = service_api_client.get_service_templates(service_id)['data']
     jobs = job_api_client.get_job(service_id)['data']
 
-    service = service_api_client.get_service(service_id)
-    session['service_name'] = service['data']['name']
-    session['service_id'] = service['data']['id']
-
     if session.get('invited_user'):
         session.pop('invited_user', None)
-        service_name = service['data']['name']
-        message = 'You have successfully accepted your invitation and been added to {}'.format(service_name)
+        message = 'You have successfully accepted your invitation and been added to {}'.format(
+            current_service['name'])
         flash(message, 'default_with_tick')
 
     statistics = statistics_api_client.get_statistics_for_service(service_id)['data']
@@ -37,7 +34,6 @@ def service_dashboard(service_id):
         more_jobs_to_show=(len(jobs) > 5),
         free_text_messages_remaining='250,000',
         spent_this_month='0.00',
-        service=service['data'],
         statistics=add_rates_to(statistics),
         templates=templates,
         service_id=str(service_id))
diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py
index 6719664f5..abcb0d85c 100644
--- a/app/main/views/jobs.py
+++ b/app/main/views/jobs.py
@@ -12,7 +12,11 @@ from flask_login import login_required
 from werkzeug.datastructures import MultiDict
 from utils.template import Template
 
-from app import (job_api_client, notification_api_client, service_api_client)
+from app import (
+    job_api_client,
+    notification_api_client,
+    service_api_client,
+    current_service)
 from app.main import main
 from app.utils import (
     get_page_from_request,
@@ -38,8 +42,7 @@ def view_jobs(service_id):
     jobs = job_api_client.get_job(service_id)['data']
     return render_template(
         'views/jobs/jobs.html',
-        jobs=jobs,
-        service_id=service_id
+        jobs=jobs
     )
 
 
@@ -47,7 +50,6 @@ def view_jobs(service_id):
 @login_required
 @user_has_permissions('view_activity', admin_override=True)
 def view_job(service_id, job_id):
-    service = service_api_client.get_service(service_id)['data']
     job = job_api_client.get_job(service_id, job_id)['data']
     template = service_api_client.get_service_template(service_id, job['template'])['data']
     notifications = notification_api_client.get_notifications_for_service(service_id, job_id)
@@ -64,10 +66,8 @@ def view_job(service_id, job_id):
         uploaded_file_name=job['original_file_name'],
         template=Template(
             template,
-            prefix=service['name']
+            prefix=current_service['name']
         ),
-        service_id=service_id,
-        service=service,
         job_id=job_id
     )
 
@@ -76,7 +76,6 @@ def view_job(service_id, job_id):
 @login_required
 @user_has_permissions('view_activity')
 def view_job_updates(service_id, job_id):
-    service = service_api_client.get_service(service_id)['data']
     job = job_api_client.get_job(service_id, job_id)['data']
     notifications = notification_api_client.get_notifications_for_service(service_id, job_id)
     finished = job['status'] == 'finished'
@@ -135,7 +134,6 @@ def view_notifications(service_id):
             'page {}'.format(page + 1))
     return render_template(
         'views/notifications.html',
-        service_id=service_id,
         notifications=notifications['notifications'],
         page=page,
         prev_page=prev_page,
@@ -157,6 +155,5 @@ def view_notification(service_id, job_id, notification_id):
         ][0],
         delivered_at=now,
         uploaded_at=now,
-        service_id=service_id,
         job_id=job_id
     )
diff --git a/app/main/views/manage_users.py b/app/main/views/manage_users.py
index ce95e7011..eecaab1e2 100644
--- a/app/main/views/manage_users.py
+++ b/app/main/views/manage_users.py
@@ -37,7 +37,6 @@ roles = {
 def manage_users(service_id):
     return render_template(
         'views/manage-users.html',
-        service_id=service_id,
         users=user_api_client.get_users_for_service(service_id=service_id),
         current_user=current_user,
         invited_users=[
@@ -51,7 +50,6 @@ def manage_users(service_id):
 @login_required
 @user_has_permissions('manage_users', admin_override=True)
 def invite_user(service_id):
-    service = service_api_client.get_service(service_id)['data']
 
     form = InviteUserForm(invalid_email_address=current_user.email_address)
 
@@ -75,7 +73,6 @@ def invite_user(service_id):
 
     return render_template(
         'views/invite-user.html',
-        service_id=service_id,
         form=form
     )
 
@@ -87,7 +84,6 @@ def edit_user_permissions(service_id, user_id):
     # TODO we should probably using the service id here in the get user
     # call as well. eg. /user/<user_id>?&service=service_id
     user = user_api_client.get_user(user_id)
-    service = service_api_client.get_service(service_id)['data']
     # Need to make the email address read only, or a disabled field?
     # Do it through the template or the form class?
     form = PermissionsForm(**{
@@ -106,8 +102,7 @@ def edit_user_permissions(service_id, user_id):
     return render_template(
         'views/edit-user-permissions.html',
         user=user,
-        form=form,
-        service_id=service_id
+        form=form
     )
 
 
@@ -116,7 +111,6 @@ def edit_user_permissions(service_id, user_id):
 @user_has_permissions('manage_users', admin_override=True)
 def remove_user_from_service(service_id, user_id):
     user = user_api_client.get_user(user_id)
-    service = service_api_client.get_service(service_id)['data']
     # Need to make the email address read only, or a disabled field?
     # Do it through the template or the form class?
     form = PermissionsForm(**{
@@ -145,8 +139,7 @@ def remove_user_from_service(service_id, user_id):
     return render_template(
         'views/edit-user-permissions.html',
         user=user,
-        form=form,
-        service_id=service_id
+        form=form
     )
 
 
diff --git a/app/main/views/send.py b/app/main/views/send.py
index 62125a589..c0d0297d3 100644
--- a/app/main/views/send.py
+++ b/app/main/views/send.py
@@ -25,8 +25,8 @@ from app.main.uploader import (
     s3upload,
     s3download
 )
-from app import (job_api_client, service_api_client)
-from app.utils import user_has_permissions, get_errors_for_csv
+from app import (job_api_client, service_api_client, current_service)
+from app.utils import (user_has_permissions, get_errors_for_csv)
 
 
 def get_send_button_text(template_type, number_of_messages):
@@ -72,9 +72,6 @@ def get_example_csv_rows(template, number_of_rows=2):
                       'manage_api_keys',
                       admin_override=True, any_=True)
 def choose_template(service_id, template_type):
-
-    service = service_api_client.get_service(service_id)['data']
-
     if template_type not in ['email', 'sms']:
         abort(404)
 
@@ -83,14 +80,12 @@ def choose_template(service_id, template_type):
         templates=[
             Template(
                 template,
-                prefix=service['name']
+                prefix=current_service['name']
             ) for template in service_api_client.get_service_templates(service_id)['data']
             if template['template_type'] == template_type
         ],
         template_type=template_type,
-        page_heading=get_page_headings(template_type),
-        service=service,
-        service_id=service_id
+        page_heading=get_page_headings(template_type)
     )
 
 
@@ -98,11 +93,9 @@ def choose_template(service_id, template_type):
 @login_required
 @user_has_permissions('send_texts', 'send_emails', 'send_letters')
 def send_messages(service_id, template_id):
-
-    service = service_api_client.get_service(service_id)['data']
     template = Template(
         service_api_client.get_service_template(service_id, template_id)['data'],
-        prefix=service['name']
+        prefix=current_service['name']
     )
 
     form = CsvUploadForm()
@@ -136,9 +129,7 @@ def send_messages(service_id, template_id):
         template=template,
         recipient_column=first_column_heading[template.template_type],
         example=get_example_csv_rows(template),
-        form=form,
-        service=service,
-        service_id=service_id
+        form=form
     )
 
 
@@ -179,8 +170,8 @@ def send_message_to_self(service_id, template_id):
     session['upload_data'] = {"template_id": template_id, "original_file_name": filedata['file_name']}
 
     return redirect(url_for('.check_messages',
-                            service_id=service_id,
                             upload_id=upload_id,
+                            service_id=service_id,
                             template_type=template.template_type))
 
 
@@ -201,8 +192,7 @@ def send_from_api(service_id, template_id):
     return render_template(
         'views/send-from-api.html',
         template=template,
-        payload=json.dumps(payload, indent=4),
-        service_id=service_id
+        payload=json.dumps(payload, indent=4)
     )
 
 
@@ -214,8 +204,6 @@ def check_messages(service_id, template_type, upload_id):
     if not session.get('upload_data'):
         return redirect(url_for('main.choose_template', service_id=service_id, template_type=template_type))
 
-    service = service_api_client.get_service(service_id)['data']
-
     contents = s3download(service_id, upload_id)
     if not contents:
         flash('There was a problem reading your upload file')
@@ -227,7 +215,7 @@ def check_messages(service_id, template_type, upload_id):
 
     template = Template(
         template,
-        prefix=service['name']
+        prefix=current_service['name']
     )
 
     recipients = RecipientCSV(
@@ -259,8 +247,6 @@ def check_messages(service_id, template_type, upload_id):
         ),
         original_file_name=session['upload_data'].get('original_file_name'),
         send_button_text=get_send_button_text(template.template_type, session['upload_data']['notification_count']),
-        service_id=service_id,
-        service=service,
         upload_id=upload_id,
         form=CsvUploadForm()
     )
@@ -272,7 +258,6 @@ def check_messages(service_id, template_type, upload_id):
 def start_job(service_id, upload_id):
 
     upload_data = session['upload_data']
-    service = service_api_client.get_service(service_id)['data']
 
     if request.files or not upload_data.get('valid'):
         # The csv was invalid, validate the csv again
@@ -289,5 +274,5 @@ def start_job(service_id, upload_id):
     )
 
     return redirect(
-        url_for('main.view_job', service_id=service_id, job_id=upload_id)
+        url_for('main.view_job', job_id=upload_id, service_id=service_id)
     )
diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py
index b02dafacb..13f24c739 100644
--- a/app/main/views/service_settings.py
+++ b/app/main/views/service_settings.py
@@ -18,27 +18,20 @@ from app.main import main
 from app.utils import user_has_permissions, email_safe
 from app.main.forms import ConfirmPasswordForm, ServiceNameForm
 from app import user_api_client
+from app import current_service
 
 
 @main.route("/services/<service_id>/service-settings")
 @login_required
 @user_has_permissions('manage_settings', admin_override=True)
 def service_settings(service_id):
-    service = service_api_client.get_service(service_id)['data']
-
-    return render_template(
-        'views/service-settings.html',
-        service=service,
-        service_id=service_id
-    )
+    return render_template('views/service-settings.html')
 
 
 @main.route("/services/<service_id>/service-settings/name", methods=['GET', 'POST'])
 @login_required
 @user_has_permissions('manage_settings', admin_override=True)
 def service_name_change(service_id):
-    service = service_api_client.get_service(service_id)['data']
-
     form = ServiceNameForm(service_api_client.find_all_service_email_from)
 
     if form.validate_on_submit():
@@ -47,16 +40,13 @@ def service_name_change(service_id):
 
     return render_template(
         'views/service-settings/name.html',
-        service=service,
-        form=form,
-        service_id=service_id)
+        form=form)
 
 
 @main.route("/services/<service_id>/service-settings/name/confirm", methods=['GET', 'POST'])
 @login_required
 @user_has_permissions('manage_settings', admin_override=True)
 def service_name_change_confirm(service_id):
-    service = service_api_client.get_service(service_id)['data']
 
     # Validate password for form
     def _check_password(pwd):
@@ -64,17 +54,17 @@ def service_name_change_confirm(service_id):
     form = ConfirmPasswordForm(_check_password)
 
     if form.validate_on_submit():
-        service['name'] = session['service_name_change']
-        service['email_from'] = email_safe(session['service_name_change'])
+        current_service['name'] = session['service_name_change']
+        current_service['email_from'] = email_safe(session['service_name_change'])
         try:
             service_api_client.update_service(
-                service['id'],
-                service['name'],
-                service['active'],
-                service['limit'],
-                service['restricted'],
-                service['users'],
-                service['email_from'])
+                current_service['id'],
+                current_service['name'],
+                current_service['active'],
+                current_service['limit'],
+                current_service['restricted'],
+                current_service['users'],
+                current_service['email_from'])
         except HTTPError as e:
             error_msg = "Duplicate service name '{}'".format(session['service_name_change'])
             if e.status_code == 400 and error_msg in e.message['name']:
@@ -84,26 +74,21 @@ def service_name_change_confirm(service_id):
             else:
                 raise e
         else:
-            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',
         heading='Change your service name',
-        form=form,
-        service_id=service_id)
+        form=form)
 
 
 @main.route("/services/<service_id>/service-settings/request-to-go-live", methods=['GET', 'POST'])
 @login_required
 @user_has_permissions('manage_settings', admin_override=True)
 def service_request_to_go_live(service_id):
-    service = service_api_client.get_service(service_id)['data']
     if request.method == 'GET':
         return render_template(
-            'views/service-settings/request-to-go-live.html',
-            service=service,
-            service_id=service_id
+            'views/service-settings/request-to-go-live.html'
         )
     elif request.method == 'POST':
         flash('Thanks your request to go live is being processed', 'default')
@@ -115,13 +100,9 @@ def service_request_to_go_live(service_id):
 @login_required
 @user_has_permissions('manage_settings', admin_override=True)
 def service_status_change(service_id):
-    service = service_api_client.get_service(service_id)['data']
-
     if request.method == 'GET':
         return render_template(
-            'views/service-settings/status.html',
-            service=service,
-            service_id=service_id
+            'views/service-settings/status.html'
         )
     elif request.method == 'POST':
         return redirect(url_for('.service_status_change_confirm', service_id=service_id))
@@ -131,43 +112,37 @@ def service_status_change(service_id):
 @login_required
 @user_has_permissions('manage_settings', admin_override=True)
 def service_status_change_confirm(service_id):
-    service = service_api_client.get_service(service_id)['data']
-
     # Validate password for form
     def _check_password(pwd):
         return user_api_client.verify_password(current_user.id, pwd)
     form = ConfirmPasswordForm(_check_password)
 
     if form.validate_on_submit():
-        service['active'] = True
+        current_service['active'] = True
         service_api_client.update_service(
-            service['id'],
-            service['name'],
-            service['active'],
-            service['limit'],
-            service['restricted'],
-            service['users'],
-            service['email_from'])
+            current_service['id'],
+            current_service['name'],
+            current_service['active'],
+            current_service['limit'],
+            current_service['restricted'],
+            current_service['users'],
+            current_service['email_from'])
         return redirect(url_for('.service_settings', service_id=service_id))
     return render_template(
         'views/service-settings/confirm.html',
         heading='Turn off all outgoing notifications',
         destructive=True,
-        form=form,
-        service_id=service_id)
+        form=form)
 
 
 @main.route("/services/<service_id>/service-settings/delete", methods=['GET', 'POST'])
 @login_required
 @user_has_permissions('manage_settings', admin_override=True)
 def service_delete(service_id):
-    service = service_api_client.get_service(service_id)['data']
 
     if request.method == 'GET':
         return render_template(
-            'views/service-settings/delete.html',
-            service=service,
-            service_id=service_id
+            'views/service-settings/delete.html'
         )
     elif request.method == 'POST':
         return redirect(url_for('.service_delete_confirm', service_id=service_id))
@@ -177,7 +152,6 @@ def service_delete(service_id):
 @login_required
 @user_has_permissions('manage_settings', admin_override=True)
 def service_delete_confirm(service_id):
-    service = service_api_client.get_service(service_id)['data']
 
     # Validate password for form
     def _check_password(pwd):
@@ -185,12 +159,11 @@ def service_delete_confirm(service_id):
     form = ConfirmPasswordForm(_check_password)
 
     if form.validate_on_submit():
-        service = service_api_client.delete_service(service_id)
+        service_api_client.delete_service(service_id)
         return redirect(url_for('.choose_service'))
 
     return render_template(
         'views/service-settings/confirm.html',
         heading='Delete this service from Notify',
         destructive=True,
-        form=form,
-        service_id=service_id)
+        form=form)
diff --git a/app/main/views/templates.py b/app/main/views/templates.py
index aecb8d90a..2e3a76418 100644
--- a/app/main/views/templates.py
+++ b/app/main/views/templates.py
@@ -23,8 +23,6 @@ page_headings = {
 @user_has_permissions('manage_templates', admin_override=True)
 def add_service_template(service_id, template_type):
 
-    service = service_api_client.get_service(service_id)
-
     if template_type not in ['sms', 'email']:
         abort(404)
 
@@ -46,7 +44,6 @@ def add_service_template(service_id, template_type):
         'views/edit-{}-template.html'.format(template_type),
         form=form,
         template_type=template_type,
-        service_id=service_id,
         heading_action='Add'
     )
 
@@ -73,7 +70,6 @@ def edit_service_template(service_id, template_id):
     return render_template(
         'views/edit-{}-template.html'.format(template['template_type']),
         form=form,
-        service_id=service_id,
         template_id=template_id,
         template_type=template['template_type'],
         heading_action='Edit'
@@ -101,5 +97,4 @@ def delete_service_template(service_id, template_id):
         'views/edit-{}-template.html'.format(template['template_type']),
         h1='Edit template',
         form=form,
-        service_id=service_id,
         template_id=template_id)
diff --git a/app/main/views/tour.py b/app/main/views/tour.py
index 3615b2a9c..1074ce0bd 100644
--- a/app/main/views/tour.py
+++ b/app/main/views/tour.py
@@ -9,7 +9,6 @@ from app.main import main
 def tour(service_id, page):
     return render_template(
         'views/tour/{}.html'.format(page),
-        service_id=service_id,  # TODO: fix when Nick’s PR is merged
         current_page=page,
         next_page=(page + 1)
     )
diff --git a/app/templates/main_nav.html b/app/templates/main_nav.html
index 418df91a8..b4448f427 100644
--- a/app/templates/main_nav.html
+++ b/app/templates/main_nav.html
@@ -1,31 +1,31 @@
 <nav class="navigation">
   <h2 class="navigation-service-name">
-    <a href="{{ url_for('.service_dashboard', service_id=service_id) }}">{{ session.get('service_name', 'Service') }}</a>
+    <a href="{{ url_for('.service_dashboard', service_id=current_service.id) }}">{{ current_service.name }}</a>
   </h2>
   {% if current_user.has_permissions(['view_activity'], admin_override=True) %}
   <ul>
-    <li><a href="{{ url_for('.view_notifications', service_id=service_id, page=1) }}">History</a></li>
+    <li><a href="{{ url_for('.view_notifications', service_id=current_service.id, page=1) }}">History</a></li>
   </ul>
   {% endif %}
   {% if current_user.has_permissions(['view_activity', 'manage_templates', 'manage_api_keys'], admin_override=True, any_=True) %}
   <ul>
-    <li><a href="{{ url_for('.choose_template', service_id=service_id, template_type='sms') }}">Text message templates</a></li>
-    <li><a href="{{ url_for('.choose_template', service_id=service_id, template_type='email') }}">Email templates</a></li>
+    <li><a href="{{ url_for('.choose_template', service_id=current_service.id, template_type='sms') }}">Text message templates</a></li>
+    <li><a href="{{ url_for('.choose_template', service_id=current_service.id, template_type='email') }}">Email templates</a></li>
   </ul>
   {% endif %}
   {% if current_user.has_permissions(['manage_users', 'manage_settings'], admin_override=True) %}
   <ul>
-    <li><a href="{{ url_for('.manage_users', service_id=service_id) }}">Team members</a></li>
-    <li><a href="{{ url_for('.service_settings', service_id=service_id) }}">Settings</a></li>
+    <li><a href="{{ url_for('.manage_users', service_id=current_service.id) }}">Team members</a></li>
+    <li><a href="{{ url_for('.service_settings', service_id=current_service.id) }}">Settings</a></li>
   </ul>
   {% elif current_user.has_permissions(['view_activity']) %}
   <ul>
-    <li><a href="{{ url_for('.manage_users', service_id=service_id) }}">Team members</a></li>
+    <li><a href="{{ url_for('.manage_users', service_id=current_service.id) }}">Team members</a></li>
   </ul>
   {% endif %}
   {% if current_user.has_permissions(['manage_api_keys']) %}
   <ul>
-    <li><a href="{{ url_for('.api_keys', service_id=service_id) }}">API keys</a></li>
+    <li><a href="{{ url_for('.api_keys', service_id=current_service.id) }}">API keys</a></li>
   </ul>
   {% endif %}
   {% if current_user.has_permissions(admin_override=True) %}
diff --git a/app/templates/views/api-keys.html b/app/templates/views/api-keys.html
index b9b5fda72..2f1422fba 100644
--- a/app/templates/views/api-keys.html
+++ b/app/templates/views/api-keys.html
@@ -18,7 +18,7 @@
 
   <p>
     API usage is described in
-    <a href="{{ url_for('.documentation', service_id=service_id) }}">the
+    <a href="{{ url_for('.documentation', service_id=current_service.id) }}">the
     developer documentation</a>.
   </p>
 
@@ -26,7 +26,7 @@
     Service ID
   </h2>
   <p class="api-key-key">
-    {{ service_id }}
+    {{ current_service.id }}
   </p>
 
   {% call(item) list_table(
@@ -45,13 +45,13 @@
       {% endcall %}
     {% else %}
       {% call field(align='right', status='error') %}
-        <a href='{{ url_for('.revoke_api_key', service_id=service_id, key_id=item.id) }}'>Revoke</a>
+        <a href='{{ url_for('.revoke_api_key', service_id=current_service.id, key_id=item.id) }}'>Revoke</a>
       {% endcall %}
     {% endif %}
   {% endcall %}
 
   <p class='table-show-more-link'>
-    <a href="{{ url_for('.create_api_key', service_id=service_id) }}">Create a new API key</a>
+    <a href="{{ url_for('.create_api_key', service_id=current_service.id) }}">Create a new API key</a>
   </p>
 
 {% endblock %}
diff --git a/app/templates/views/check.html b/app/templates/views/check.html
index 0bd132ea9..549602ad0 100644
--- a/app/templates/views/check.html
+++ b/app/templates/views/check.html
@@ -48,8 +48,8 @@
     {{ email_message(
       template.subject,
       template.formatted_as_markup if errors else template.replaced,
-      from_address='{}@notifications.service.gov.uk'.format(service.email_from),
-      from_name=service.name
+      from_address='{}@notifications.service.gov.uk'.format(current_service.email_from),
+      from_name=current_service.name
     )}}
   {% elif 'sms' == template.template_type %}
     <div class="grid-row">
@@ -64,10 +64,10 @@
   {% if errors %}
     {{file_upload(form.file, button_text='Re-upload your file')}}
   {% else %}
-    <form method="post" enctype="multipart/form-data" action="{{url_for('main.start_job', service_id=service_id, upload_id=upload_id)}}">
+    <form method="post" enctype="multipart/form-data" action="{{url_for('main.start_job', service_id=current_service.id, upload_id=upload_id)}}">
       <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
       <input type="submit" class="button" value="{{ send_button_text }}" />
-      <a href="{{url_for('.send_messages', service_id=service_id, template_id=template.id)}}" class="page-footer-back-link">Back</a>
+      <a href="{{url_for('.send_messages', service_id=current_service.id, template_id=template.id)}}" class="page-footer-back-link">Back</a>
     </form>
   {% endif %}
 
diff --git a/app/templates/views/choose-template.html b/app/templates/views/choose-template.html
index 6bf7674f1..15d1ba883 100644
--- a/app/templates/views/choose-template.html
+++ b/app/templates/views/choose-template.html
@@ -19,7 +19,7 @@
          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>
+      <a href="{{ url_for('.add_service_template', service_id=current_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>
     {% endif %}
@@ -32,7 +32,7 @@
       </div>
       {% if current_user.has_permissions(permissions=['manage_templates'], admin_override=True) %}
         <div class="column-one-third">
-          <a href="{{ url_for('.add_service_template', service_id=service_id, template_type=template_type) }}" class="button align-with-heading">Add new template</a>
+          <a href="{{ url_for('.add_service_template', service_id=current_service.id, template_type=template_type) }}" class="button align-with-heading">Add new template</a>
         </div>
       {% endif %}
     </div>
@@ -46,7 +46,7 @@
               template.formatted_as_markup,
               name=template.name,
               edit_link=(
-                url_for(".edit_service_template", service_id=service_id, template_id=template.id)
+                url_for(".edit_service_template", service_id=current_service.id, template_id=template.id)
                 if current_user.has_permissions(permissions=['manage_templates'], admin_override=True) else
                 None
               )
@@ -56,7 +56,7 @@
                 template.formatted_as_markup,
                 name=template.name,
                 edit_link=(
-                  url_for(".edit_service_template", service_id=service_id, template_id=template.id)
+                  url_for(".edit_service_template", service_id=current_service.id, template_id=template.id)
                   if current_user.has_permissions(permissions=['manage_templates'], admin_override=True) else
                   None
                 )
@@ -66,11 +66,11 @@
         <div class="column-one-third">
           <div class="sms-message-use-links">
             {% if current_user.has_permissions(permissions=['send_texts', 'send_emails', 'send_letters']) %}
-              <a href="{{ url_for(".send_messages", service_id=service_id, template_id=template.id) }}">Send from a CSV file</a>
-              <a href="{{ url_for(".send_message_to_self", service_id=service_id, template_id=template.id) }}">Send yourself a test</a>
+              <a href="{{ url_for(".send_messages", service_id=current_service.id, template_id=template.id) }}">Send from a CSV file</a>
+              <a href="{{ url_for(".send_message_to_self", service_id=current_service.id, template_id=template.id) }}">Send yourself a test</a>
             {% endif %}
             {% if current_user.has_permissions(permissions=['manage_api_keys']) %}
-              <a href="{{ url_for(".send_from_api", service_id=service_id, template_id=template.id) }}">API integration</a>
+              <a href="{{ url_for(".send_from_api", service_id=current_service.id, template_id=template.id) }}">API integration</a>
             {% endif %}
           </div>
         </div>
diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html
index bb97d9c7b..bd9c3149f 100644
--- a/app/templates/views/dashboard/dashboard.html
+++ b/app/templates/views/dashboard/dashboard.html
@@ -1,23 +1,22 @@
 {% extends "withnav_template.html" %}
 
 {% block page_title %}
-  {{ session.get('service_name', 'Dashboard') }} – GOV.UK Notify
+  {{ current_service.name }} – GOV.UK Notify
 {% endblock %}
 
 {% block maincolumn_content %}
   
     {% if not templates and current_user.has_permissions(['send_texts', 'send_emails', 'send_letters'], any_=True) %}
       {% include 'views/dashboard/get-started.html' %}
-    {% elif service.restricted %}
+    {% elif current_service.restricted %}
       <div class="dashboard">
         {% include 'views/dashboard/trial-mode-banner.html' %}
       </div>
     {% endif %}
 
-
       <div
         data-module="update-content"
-        data-resource="{{url_for(".service_dashboard_updates", service_id=service_id)}}"
+        data-resource="{{url_for(".service_dashboard_updates", service_id=current_service.id)}}"
         data-key="today"
         data-interval-seconds="10"
       >
diff --git a/app/templates/views/dashboard/get-started.html b/app/templates/views/dashboard/get-started.html
index ae91dc2df..c35b1a2c7 100644
--- a/app/templates/views/dashboard/get-started.html
+++ b/app/templates/views/dashboard/get-started.html
@@ -4,12 +4,12 @@
   {% call banner_wrapper(type='tour') %}
     <h2 class="heading-large">You’re ready to get started</h2>
     <p>
-      <a href='{{ url_for(".add_service_template", service_id=service_id, template_type="sms") }}'>
+      <a href='{{ url_for(".add_service_template", service_id=current_service.id, template_type="sms") }}'>
         Set up a text message template
       </a>
     </p>
     <p>
-      <a href='{{ url_for(".add_service_template", service_id=service_id, template_type="email") }}'>
+      <a href='{{ url_for(".add_service_template", service_id=current_service.id, template_type="email") }}'>
         Set up an email template
       </a>
     </p>
diff --git a/app/templates/views/dashboard/jobs.html b/app/templates/views/dashboard/jobs.html
index f4f0893b5..e562111d1 100644
--- a/app/templates/views/dashboard/jobs.html
+++ b/app/templates/views/dashboard/jobs.html
@@ -7,7 +7,7 @@
   field_headings=['File', 'Started', right_aligned_field_heading('Rows')]
 ) %}
   {% call field() %}
-    <a href="{{ url_for('.view_job', service_id=service_id, job_id=item.id) }}">{{ item.original_file_name }}</a>
+    <a href="{{ url_for('.view_job', service_id=current_service.id, job_id=item.id) }}">{{ item.original_file_name }}</a>
   {% endcall %}
   {% call field() %}
     {{ item.created_at|format_datetime }}
@@ -19,7 +19,7 @@
 {% if more_jobs_to_show %}
   {% if current_user.has_permissions(['send_texts', 'send_emails', 'send_letters']) %}
     <p class="table-show-more-link">
-      <a href="{{ url_for('.view_jobs', service_id=service_id) }}">See all sent batch messages</a>
+      <a href="{{ url_for('.view_jobs', service_id=current_service.id) }}">See all sent batch messages</a>
     </p>
   {% endif %}
 {% endif %}
diff --git a/app/templates/views/edit-email-template.html b/app/templates/views/edit-email-template.html
index c67f6cb1b..2198b0cf0 100644
--- a/app/templates/views/edit-email-template.html
+++ b/app/templates/views/edit-email-template.html
@@ -36,5 +36,4 @@
       </div>
     </form>
 
-
 {% endblock %}
diff --git a/app/templates/views/edit-user-permissions.html b/app/templates/views/edit-user-permissions.html
index 315414122..8dce64c72 100644
--- a/app/templates/views/edit-user-permissions.html
+++ b/app/templates/views/edit-user-permissions.html
@@ -23,7 +23,7 @@ Manage users – GOV.UK Notify
 
         {{ page_footer(
           'Save',
-          delete_link=url_for('.remove_user_from_service', service_id=service_id, user_id=user.id) if user or None,
+          delete_link=url_for('.remove_user_from_service', service_id=current_service.id, user_id=user.id) if user or None,
           delete_link_text='Remove user from service'
         ) }}
 
diff --git a/app/templates/views/jobs/job.html b/app/templates/views/jobs/job.html
index ddec1812b..abe0ea76f 100644
--- a/app/templates/views/jobs/job.html
+++ b/app/templates/views/jobs/job.html
@@ -33,7 +33,7 @@
     {% if not finished_at %}
       <div
         data-module="update-content"
-        data-resource="{{url_for(".view_job_updates", service_id=service_id, job_id=job_id)}}"
+        data-resource="{{url_for(".view_job_updates", service_id=current_service.id, job_id=job_id)}}"
         data-key="status"
       >
     {% endif %}
@@ -45,7 +45,7 @@
     {% if not finished_at %}
       <div
         data-module="update-content"
-        data-resource="{{url_for(".view_job_updates", service_id=service_id, job_id=job_id)}}"
+        data-resource="{{url_for(".view_job_updates", service_id=current_service.id, job_id=job_id)}}"
         data-key="counts"
       >
     {% endif %}
@@ -57,7 +57,7 @@
     {% if not finished_at %}
       <div
         data-module="update-content"
-        data-resource="{{url_for(".view_job_updates", service_id=service_id, job_id=job_id)}}"
+        data-resource="{{url_for(".view_job_updates", service_id=current_service.id, job_id=job_id)}}"
         data-key="notifications"
       >
     {% endif %}
diff --git a/app/templates/views/jobs/jobs.html b/app/templates/views/jobs/jobs.html
index 596ce1b1b..341ebe4b9 100644
--- a/app/templates/views/jobs/jobs.html
+++ b/app/templates/views/jobs/jobs.html
@@ -27,7 +27,7 @@
       field_headings=['Job', 'Time', right_aligned_field_heading('Status')]
     ) %}
       {% call field() %}
-        <a href="{{ url_for('.view_job', service_id=service_id, job_id=item.id) }}">{{ item.original_file_name }}</a>
+        <a href="{{ url_for('.view_job', service_id=current_service.id, job_id=item.id) }}">{{ item.original_file_name }}</a>
       {% endcall %}
       {% call field() %}
         {{ item.created_at | format_datetime}}
diff --git a/app/templates/views/manage-users.html b/app/templates/views/manage-users.html
index 1f88b9631..df4aaba75 100644
--- a/app/templates/views/manage-users.html
+++ b/app/templates/views/manage-users.html
@@ -24,7 +24,7 @@ Manage users – GOV.UK Notify
     </div>
     {% if current_user.has_permissions(['manage_users']) %}
       <div class="column-one-third">
-        <a href="{{ url_for('.invite_user', service_id=service_id) }}" class="button align-with-heading">Invite team member</a>
+        <a href="{{ url_for('.invite_user', service_id=current_service.id) }}" class="button align-with-heading">Invite team member</a>
       </div>
     {% endif %}
   </div>
@@ -41,7 +41,7 @@ Manage users – GOV.UK Notify
     {% call field(align='right') %}
       {% if current_user.has_permissions(['manage_users']) %}
         {% if current_user.id != item.id %}
-          <a href="{{ url_for('.edit_user_permissions', service_id=service_id, user_id=item.id)}}">Edit</a>
+          <a href="{{ url_for('.edit_user_permissions', service_id=current_service.id, user_id=item.id)}}">Edit</a>
         {% endif %}
       {% endif %}
     {% endcall %}
@@ -60,7 +60,7 @@ Manage users – GOV.UK Notify
       {% if item.status == 'pending' %}
         {% call field(align='right') %}
           {% if current_user.has_permissions(['manage_users']) %}
-            <a href="{{ url_for('.cancel_invited_user', service_id=service_id, invited_user_id=item.id)}}">Cancel invitation</a>
+            <a href="{{ url_for('.cancel_invited_user', service_id=current_service.id, invited_user_id=item.id)}}">Cancel invitation</a>
           {% endif %}
         {% endcall %}
       {% else %}
diff --git a/app/templates/views/notification.html b/app/templates/views/notification.html
index 0cc1d5ff9..ca550b02c 100644
--- a/app/templates/views/notification.html
+++ b/app/templates/views/notification.html
@@ -26,7 +26,7 @@
     </div>
 
     {{ page_footer(
-      secondary_link = url_for('.view_job', service_id=service_id, job_id=job_id),
+      secondary_link = url_for('.view_job', service_id=current_service.id, job_id=job_id),
       secondary_link_text = 'View other messages in this job'
     ) }}
 
diff --git a/app/templates/views/notifications.html b/app/templates/views/notifications.html
index 24eec7ddd..6165b0508 100644
--- a/app/templates/views/notifications.html
+++ b/app/templates/views/notifications.html
@@ -31,14 +31,14 @@
         {{ item.to }}
       {% endcall %}
       {% call field() %}
-        <a href="{{ url_for(".choose_template", service_id=service_id, template_type=item.template.template_type, _anchor=item.template.name|linkable_name) }}">{{ item.template.name }}</a>
+        <a href="{{ url_for(".choose_template", service_id=current_service.id, template_type=item.template.template_type, _anchor=item.template.name|linkable_name) }}">{{ item.template.name }}</a>
       {% endcall %}
       {% call field() %}
         {{ item.template.template_type }}
       {% endcall %}
       {% call field() %}
         {% if item.job %}
-          <a href="{{ url_for(".view_job", service_id=service_id, job_id=item.job.id) }}">{{ item.job.original_file_name }}</a>
+          <a href="{{ url_for(".view_job", service_id=current_service.id, job_id=item.job.id) }}">{{ item.job.original_file_name }}</a>
         {% endif %}
       {% endcall %}
       {% call field() %}
diff --git a/app/templates/views/send.html b/app/templates/views/send.html
index bedd1282f..7786f396d 100644
--- a/app/templates/views/send.html
+++ b/app/templates/views/send.html
@@ -23,8 +23,8 @@
     {{ email_message(
       template.subject,
       template.formatted_as_markup,
-      from_address='{}@notifications.service.gov.uk'.format(service.email_from),
-      from_name=service.name
+      from_address='{}@notifications.service.gov.uk'.format(current_service.email_from),
+      from_name=current_service.name
     ) }}
   {% endif %}
 
@@ -51,10 +51,9 @@
   {% endcall %}
 
   <p class="bottom-gutter">
-    <a href="{{ url_for('.get_example_csv', service_id=service_id, template_id=template.id) }}">Download this example</a>
+    <a href="{{ url_for('.get_example_csv', service_id=current_service.id, template_id=template.id) }}">Download this example</a>
   </p>
 
-
   {{file_upload(form.file, button_text='Upload your CSV file')}}
 
 {% endblock %}
\ No newline at end of file
diff --git a/app/templates/views/service-settings.html b/app/templates/views/service-settings.html
index a444cec9f..5fb51c84c 100644
--- a/app/templates/views/service-settings.html
+++ b/app/templates/views/service-settings.html
@@ -12,21 +12,21 @@
     {{ browse_list([
       {
         'title': 'Change your service name',
-        'link': url_for('.service_name_change', service_id=service_id)
+        'link': url_for('.service_name_change', service_id=current_service.id)
       },
       {
         'title': 'Request to go live and turn off sending restrictions',
-        'link': url_for('.service_request_to_go_live', service_id=service_id),
+        'link': url_for('.service_request_to_go_live', service_id=current_service.id),
         'hint': 'A live service can send notifications to any phone number or email address',
-      } if not service.live else {
+      } if not current_service.live else {
       },
       {
         'title': 'Temporarily suspend API keys',
-        'link': url_for('.service_status_change', service_id=service_id),
+        'link': url_for('.service_status_change', service_id=current_service.id),
         'destructive': True
-      } if not service.active else {
+      } if not current_service.active else {
         'title': 'Reactivate API keys',
-        'link': url_for('.service_status_change', service_id=service_id)
+        'link': url_for('.service_status_change', service_id=current_service.id)
       }
     ]) }}
 
diff --git a/app/templates/views/service-settings/confirm.html b/app/templates/views/service-settings/confirm.html
index 37d69881c..ffe96bc2b 100644
--- a/app/templates/views/service-settings/confirm.html
+++ b/app/templates/views/service-settings/confirm.html
@@ -18,7 +18,7 @@
       {{ page_footer(
         'Confirm',
         destructive=destructive,
-        back_link=url_for('.service_settings', service_id=service_id)
+        back_link=url_for('.service_settings', service_id=current_service.id)
       ) }}
     </form>
     </div>
diff --git a/app/templates/views/service-settings/delete.html b/app/templates/views/service-settings/delete.html
index 04d526c26..04d79ebd3 100644
--- a/app/templates/views/service-settings/delete.html
+++ b/app/templates/views/service-settings/delete.html
@@ -35,9 +35,9 @@
 
       <form method="post">
         {{ page_footer(
-          'Yes, delete ‘{}’'.format(service.name),
+          'Yes, delete ‘{}’'.format(current_service.name),
           destructive=True,
-          back_link=url_for('.service_settings', service_id=service_id)
+          back_link=url_for('.service_settings', service_id=current_service.id)
         ) }}
       </form>
 
diff --git a/app/templates/views/service-settings/name.html b/app/templates/views/service-settings/name.html
index 5094dcace..a488b05bc 100644
--- a/app/templates/views/service-settings/name.html
+++ b/app/templates/views/service-settings/name.html
@@ -24,7 +24,7 @@
         {{ textbox(form.name) }}
         {{ page_footer(
           'Save',
-          back_link=url_for('.service_settings', service_id=service_id),
+          back_link=url_for('.service_settings', service_id=current_service.id),
           back_link_text='Back to settings'
         ) }}
       </form>
diff --git a/app/templates/views/service-settings/status.html b/app/templates/views/service-settings/status.html
index dc33d36ff..d2648a5d7 100644
--- a/app/templates/views/service-settings/status.html
+++ b/app/templates/views/service-settings/status.html
@@ -25,7 +25,7 @@
         {{ page_footer(
           'Suspend API keys',
           destructive=True,
-          back_link=url_for('.service_settings', service_id=service_id),
+          back_link=url_for('.service_settings', service_id=current_service.id),
           back_link_text='Back to settings'
         ) }}
       </form>
diff --git a/tests/app/main/views/test_accept_invite.py b/tests/app/main/views/test_accept_invite.py
index a3026322a..32a5c2db9 100644
--- a/tests/app/main/views/test_accept_invite.py
+++ b/tests/app/main/views/test_accept_invite.py
@@ -13,6 +13,7 @@ def test_existing_user_accept_invite_calls_api_and_redirects_to_dashboard(app_,
                                                                           service_one,
                                                                           api_user_active,
                                                                           sample_invite,
+                                                                          mock_get_service,
                                                                           mock_check_invite_token,
                                                                           mock_get_user_by_email,
                                                                           mock_get_users_by_service,
@@ -43,7 +44,8 @@ def test_existing_user_with_no_permissions_accept_invite(app_,
                                                          mock_check_invite_token,
                                                          mock_get_user_by_email,
                                                          mock_get_users_by_service,
-                                                         mock_add_user_to_service):
+                                                         mock_add_user_to_service,
+                                                         mock_get_service):
 
     expected_service = service_one['id']
     sample_invite['permissions'] = ''
@@ -61,7 +63,8 @@ def test_existing_user_with_no_permissions_accept_invite(app_,
 
 def test_if_existing_user_accepts_twice_they_redirect_to_sign_in(app_,
                                                                  mocker,
-                                                                 sample_invite):
+                                                                 sample_invite,
+                                                                 mock_get_service):
 
     sample_invite['status'] = 'accepted'
     invite = InvitedUser(**sample_invite)
@@ -82,6 +85,7 @@ def test_existing_user_of_service_get_redirected_to_signin(app_,
                                                            mocker,
                                                            api_user_active,
                                                            sample_invite,
+                                                           mock_get_service,
                                                            mock_get_user_by_email,
                                                            mock_accept_invite):
     sample_invite['email_address'] = api_user_active.email_address
@@ -109,7 +113,8 @@ def test_existing_signed_out_user_accept_invite_redirects_to_sign_in(app_,
                                                                      mock_get_user_by_email,
                                                                      mock_get_users_by_service,
                                                                      mock_add_user_to_service,
-                                                                     mock_accept_invite):
+                                                                     mock_accept_invite,
+                                                                     mock_get_service):
 
     expected_service = service_one['id']
     expected_permissions = ['send_messages', 'manage_service', 'manage_api_keys']
@@ -136,7 +141,8 @@ def test_new_user_accept_invite_calls_api_and_redirects_to_registration(app_,
                                                                         mock_check_invite_token,
                                                                         mock_dont_get_user_by_email,
                                                                         mock_add_user_to_service,
-                                                                        mock_get_users_by_service):
+                                                                        mock_get_users_by_service,
+                                                                        mock_get_service):
 
     expected_redirect_location = 'http://localhost/register-from-invite'
 
@@ -157,7 +163,8 @@ def test_new_user_accept_invite_calls_api_and_views_registration_page(app_,
                                                                       mock_check_invite_token,
                                                                       mock_dont_get_user_by_email,
                                                                       mock_add_user_to_service,
-                                                                      mock_get_users_by_service):
+                                                                      mock_get_users_by_service,
+                                                                      mock_get_service):
 
     with app_.test_request_context():
         with app_.test_client() as client:
@@ -215,7 +222,8 @@ def test_new_user_accept_invite_completes_new_registration_redirects_to_verify(a
                                                                                mock_register_user,
                                                                                mock_send_verify_code,
                                                                                mock_get_users_by_service,
-                                                                               mock_add_user_to_service):
+                                                                               mock_add_user_to_service,
+                                                                               mock_get_service):
 
     expected_service = service_one['id']
     expected_email = sample_invite['email_address']
@@ -261,7 +269,8 @@ def test_signed_in_existing_user_cannot_use_anothers_invite(app_,
                                                             api_user_active,
                                                             sample_invite,
                                                             mock_get_user,
-                                                            mock_accept_invite):
+                                                            mock_accept_invite,
+                                                            mock_get_service):
     invite = InvitedUser(**sample_invite)
     mocker.patch('app.invite_api_client.check_token', return_value=invite)
     mocker.patch('app.user_api_client.get_users_for_service', return_value=[api_user_active])
@@ -287,7 +296,8 @@ def test_signed_out_existing_user_cannot_use_anothers_invite(app_,
                                                              mock_get_user_by_email,
                                                              mock_verify_password,
                                                              mock_send_verify_code,
-                                                             mock_accept_invite):
+                                                             mock_accept_invite,
+                                                             mock_get_service):
     invite = InvitedUser(**sample_invite)
     mocker.patch('app.invite_api_client.check_token', return_value=invite)
     mocker.patch('app.user_api_client.get_users_for_service', return_value=[api_user_active])
diff --git a/tests/app/main/views/test_api_keys.py b/tests/app/main/views/test_api_keys.py
index 12509d391..2d65690de 100644
--- a/tests/app/main/views/test_api_keys.py
+++ b/tests/app/main/views/test_api_keys.py
@@ -6,9 +6,10 @@ from tests import validate_route_permission
 
 def test_should_show_api_keys_and_documentation_page(app_,
                                                      api_user_active,
+                                                     mock_login,
                                                      mock_get_user,
                                                      mock_get_user_by_email,
-                                                     mock_login):
+                                                     mock_get_service):
     with app_.test_request_context():
         with app_.test_client() as client:
             client.login(api_user_active)
@@ -20,9 +21,10 @@ def test_should_show_api_keys_and_documentation_page(app_,
 def test_should_show_empty_api_keys_page(app_,
                                          api_user_active,
                                          mock_get_user,
+                                         mock_login,
                                          mock_get_user_by_email,
                                          mock_get_no_api_keys,
-                                         mock_login,
+                                         mock_get_service,
                                          mock_has_permissions):
     with app_.test_request_context():
         with app_.test_client() as client:
@@ -38,10 +40,11 @@ def test_should_show_empty_api_keys_page(app_,
 
 def test_should_show_api_keys_page(app_,
                                    api_user_active,
+                                   mock_login,
                                    mock_get_user,
                                    mock_get_user_by_email,
                                    mock_get_api_keys,
-                                   mock_login,
+                                   mock_get_service,
                                    mock_has_permissions):
     with app_.test_request_context():
         with app_.test_client() as client:
@@ -58,10 +61,11 @@ def test_should_show_api_keys_page(app_,
 
 def test_should_show_name_api_key_page(app_,
                                        api_user_active,
+                                       mock_login,
                                        mock_get_user,
                                        mock_get_user_by_email,
                                        mock_get_api_keys,
-                                       mock_login,
+                                       mock_get_service,
                                        mock_has_permissions):
     with app_.test_request_context():
         with app_.test_client() as client:
@@ -74,11 +78,12 @@ def test_should_show_name_api_key_page(app_,
 
 def test_should_render_show_api_key(app_,
                                     api_user_active,
+                                    mock_login,
                                     mock_get_user,
                                     mock_get_user_by_email,
                                     mock_create_api_key,
                                     mock_get_api_keys,
-                                    mock_login,
+                                    mock_get_service,
                                     mock_has_permissions):
     with app_.test_request_context():
         with app_.test_client() as client:
@@ -94,10 +99,11 @@ def test_should_render_show_api_key(app_,
 
 def test_should_show_confirm_revoke_api_key(app_,
                                             api_user_active,
+                                            mock_login,
                                             mock_get_user,
                                             mock_get_user_by_email,
                                             mock_get_api_keys,
-                                            mock_login,
+                                            mock_get_service,
                                             mock_has_permissions):
     with app_.test_request_context():
         with app_.test_client() as client:
@@ -112,11 +118,12 @@ def test_should_show_confirm_revoke_api_key(app_,
 
 def test_should_redirect_after_revoking_api_key(app_,
                                                 api_user_active,
+                                                mock_login,
                                                 mock_get_user,
                                                 mock_get_user_by_email,
                                                 mock_revoke_api_key,
                                                 mock_get_api_keys,
-                                                mock_login,
+                                                mock_get_service,
                                                 mock_has_permissions):
     with app_.test_request_context():
         with app_.test_client() as client:
@@ -130,7 +137,11 @@ def test_should_redirect_after_revoking_api_key(app_,
         mock_get_api_keys.assert_called_once_with(service_id=service_id, key_id=321)
 
 
-def test_route_permissions(mocker, app_, api_user_active, service_one, mock_get_api_keys):
+def test_route_permissions(mocker,
+                           app_,
+                           api_user_active,
+                           service_one,
+                           mock_get_api_keys):
     routes = [
         'main.api_keys',
         'main.create_api_key',
@@ -148,7 +159,11 @@ def test_route_permissions(mocker, app_, api_user_active, service_one, mock_get_
                 service_one)
 
 
-def test_route_invalid_permissions(mocker, app_, api_user_active, service_one, mock_get_api_keys):
+def test_route_invalid_permissions(mocker,
+                                   app_,
+                                   api_user_active,
+                                   service_one,
+                                   mock_get_api_keys):
     routes = [
         'main.api_keys',
         'main.create_api_key',
diff --git a/tests/app/main/views/test_jobs.py b/tests/app/main/views/test_jobs.py
index f1ce86394..994ae27c8 100644
--- a/tests/app/main/views/test_jobs.py
+++ b/tests/app/main/views/test_jobs.py
@@ -9,6 +9,7 @@ def test_should_return_list_of_all_jobs(app_,
                                         mock_get_user,
                                         mock_get_user_by_email,
                                         mock_login,
+                                        mock_get_service,
                                         mock_get_jobs,
                                         mock_has_permissions):
     with app_.test_request_context():
diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py
index 2a5bd69b2..2553abc71 100644
--- a/tests/app/main/views/test_service_settings.py
+++ b/tests/app/main/views/test_service_settings.py
@@ -283,10 +283,10 @@ def test_should_redirect_after_status_confirmation(app_,
 
 def test_should_show_delete_page(app_,
                                  api_user_active,
+                                 mock_login,
                                  mock_get_service,
                                  mock_get_user,
                                  mock_get_user_by_email,
-                                 mock_login,
                                  mock_has_permissions):
     with app_.test_request_context():
         with app_.test_client() as client:
diff --git a/tests/app/main/views/test_templates.py b/tests/app/main/views/test_templates.py
index bd57906e6..6b8bd6fbc 100644
--- a/tests/app/main/views/test_templates.py
+++ b/tests/app/main/views/test_templates.py
@@ -7,10 +7,11 @@ from flask import url_for
 
 def test_should_show_page_for_one_templates(app_,
                                             api_user_active,
+                                            mock_login,
+                                            mock_get_service,
                                             mock_get_service_template,
                                             mock_get_user,
                                             mock_get_user_by_email,
-                                            mock_login,
                                             mock_has_permissions):
     with app_.test_request_context():
         with app_.test_client() as client:
@@ -31,11 +32,12 @@ def test_should_show_page_for_one_templates(app_,
 
 def test_should_redirect_when_saving_a_template(app_,
                                                 api_user_active,
+                                                mock_login,
                                                 mock_get_service_template,
                                                 mock_update_service_template,
                                                 mock_get_user,
+                                                mock_get_service,
                                                 mock_get_user_by_email,
-                                                mock_login,
                                                 mock_has_permissions):
     with app_.test_request_context():
         with app_.test_client() as client:
@@ -65,10 +67,11 @@ def test_should_redirect_when_saving_a_template(app_,
 
 def test_should_show_delete_template_page(app_,
                                           api_user_active,
+                                          mock_login,
+                                          mock_get_service,
                                           mock_get_service_template,
                                           mock_get_user,
                                           mock_get_user_by_email,
-                                          mock_login,
                                           mock_has_permissions):
     with app_.test_request_context():
         with app_.test_client() as client:
@@ -91,11 +94,12 @@ def test_should_show_delete_template_page(app_,
 
 def test_should_redirect_when_deleting_a_template(app_,
                                                   api_user_active,
+                                                  mock_login,
+                                                  mock_get_service,
                                                   mock_get_service_template,
                                                   mock_delete_service_template,
                                                   mock_get_user,
                                                   mock_get_user_by_email,
-                                                  mock_login,
                                                   mock_has_permissions):
     with app_.test_request_context():
         with app_.test_client() as client:
diff --git a/tests/app/main/views/test_tour.py b/tests/app/main/views/test_tour.py
index 1fe0a0068..0b2249eeb 100644
--- a/tests/app/main/views/test_tour.py
+++ b/tests/app/main/views/test_tour.py
@@ -9,6 +9,7 @@ def test_should_render_tour_pages(
     app_,
     api_user_active,
     mocker,
+    mock_get_service,
     page
 ):
     with app_.test_request_context():