diff --git a/app/__init__.py b/app/__init__.py
index f2714a8cc..9e837c086 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -213,14 +213,14 @@ def load_user(user_id):
 
 
 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'])
+    service_id = request.view_args.get('service_id', session.get('service_id')) if request.view_args \
+        else session.get('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'] if service_id else None)
 
 
 def save_service_after_request(response):
diff --git a/app/templates/views/api-keys/revoke.html b/app/templates/views/api-keys/revoke.html
index bf79c08b5..4fe3880b9 100644
--- a/app/templates/views/api-keys/revoke.html
+++ b/app/templates/views/api-keys/revoke.html
@@ -28,7 +28,7 @@
     <form method="post">
       {{ page_footer(
         'Revoke this API key',
-        back_link=url_for('.api_keys', service_id=service_id),
+        back_link=url_for('.api_keys', service_id=current_service.id),
         back_link_text='Back to API keys',
         destructive=True
       ) }}
diff --git a/app/templates/views/edit-email-template.html b/app/templates/views/edit-email-template.html
index 2198b0cf0..e7e50b1dc 100644
--- a/app/templates/views/edit-email-template.html
+++ b/app/templates/views/edit-email-template.html
@@ -22,7 +22,7 @@
           {{ textbox(form.template_content, highlight_tags=True, width='1-1') }}
           {{ page_footer(
             'Save',
-            delete_link=url_for('.delete_service_template', service_id=service_id, template_id=template_id) if template_id or None,
+            delete_link=url_for('.delete_service_template', service_id=current_service.id, template_id=template_id) if template_id or None,
             delete_link_text='Delete this template'
           ) }}
         </div>
diff --git a/app/templates/views/edit-sms-template.html b/app/templates/views/edit-sms-template.html
index d2577ce1a..e16bc0d03 100644
--- a/app/templates/views/edit-sms-template.html
+++ b/app/templates/views/edit-sms-template.html
@@ -21,7 +21,7 @@
           {{ textbox(form.template_content, highlight_tags=True, width='1-1') }}
           {{ page_footer(
             'Save',
-            delete_link=url_for('.delete_service_template', service_id=service_id, template_id=template_id) if template_id or None,
+            delete_link=url_for('.delete_service_template', service_id=current_service.id, template_id=template_id) if template_id or None,
             delete_link_text='Delete this template'
           ) }}
         </div>