diff --git a/app/main/views/send.py b/app/main/views/send.py
index f656c20e4..b622d526a 100644
--- a/app/main/views/send.py
+++ b/app/main/views/send.py
@@ -26,15 +26,30 @@ from app.main.uploader import (
 from app.main.dao import templates_dao
 from app.main.dao import services_dao
 from app import job_api_client
-from app.utils import validate_recipient, InvalidPhoneError, InvalidEmailError
+from app.utils import (
+    validate_recipient, InvalidPhoneError, InvalidEmailError, user_has_permissions)
 from utils.process_csv import first_column_heading
 
-page_headings = {
+
+manage_service_page_headings = {
     'email': 'Send emails',
     'sms': 'Send text messages'
 }
 
 
+manage_templates_page_headings = {
+    'email': 'Manage templates',
+    'sms': 'Manage templates'
+}
+
+
+def get_page_headings(template_type):
+    if current_user.has_permissions(['manage_service']):
+        return manage_service_page_headings[template_type]
+    else:
+        return manage_templates_page_headings[template_type]
+
+
 @main.route("/services/<service_id>/send/letters", methods=['GET'])
 def letters_stub(service_id):
     return render_template(
@@ -43,6 +58,8 @@ def letters_stub(service_id):
 
 
 @main.route("/services/<service_id>/send/<template_type>", methods=['GET'])
+@login_required
+@user_has_permissions('send_messages', 'manage_templates', or_=True)
 def choose_template(service_id, template_type):
 
     service = services_dao.get_service_by_id_or_404(service_id)
@@ -66,7 +83,7 @@ def choose_template(service_id, template_type):
             if template['template_type'] == template_type
         ],
         template_type=template_type,
-        page_heading=page_headings[template_type],
+        page_heading=get_page_headings(template_type),
         service=service,
         has_jobs=len(jobs),
         service_id=service_id
@@ -75,6 +92,7 @@ def choose_template(service_id, template_type):
 
 @main.route("/services/<service_id>/send/<int:template_id>", methods=['GET', 'POST'])
 @login_required
+@user_has_permissions('send_messages')
 def send_messages(service_id, template_id):
 
     form = CsvUploadForm()
@@ -112,6 +130,7 @@ def send_messages(service_id, template_id):
 
 @main.route("/services/<service_id>/send/<template_id>.csv", methods=['GET'])
 @login_required
+@user_has_permissions('send_messages', 'manage_templates', or_=True)
 def get_example_csv(service_id, template_id):
     template = Template(templates_dao.get_service_template_or_404(service_id, template_id)['data'])
     output = io.StringIO()
@@ -131,6 +150,7 @@ def get_example_csv(service_id, template_id):
 
 @main.route("/services/<service_id>/send/<template_id>/to-self", methods=['GET'])
 @login_required
+@user_has_permissions('send_messages')
 def send_message_to_self(service_id, template_id):
     template = Template(templates_dao.get_service_template_or_404(service_id, template_id)['data'])
     output = io.StringIO()
@@ -166,6 +186,7 @@ def send_message_to_self(service_id, template_id):
 @main.route("/services/<service_id>/check/<upload_id>",
             methods=['GET', 'POST'])
 @login_required
+@user_has_permissions('send_messages')
 def check_messages(service_id, upload_id):
 
     upload_data = session['upload_data']
@@ -189,7 +210,7 @@ def check_messages(service_id, upload_id):
             'views/check.html',
             upload_result=upload_result,
             template=template,
-            page_heading=page_headings[template.template_type],
+            page_heading=get_page_headings(template.template_type),
             column_headers=[first_column_heading[template.template_type]] + list(template.placeholders_as_markup),
             original_file_name=upload_data.get('original_file_name'),
             service_id=service_id,
diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py
index 12b68f307..df2b1f2f7 100644
--- a/app/main/views/service_settings.py
+++ b/app/main/views/service_settings.py
@@ -3,6 +3,7 @@ from flask import (
 from flask_login import (login_required, current_user)
 
 from app.main import main
+from app.utils import user_has_permissions
 from app.main.dao.services_dao import (
     get_service_by_id, delete_service, update_service)
 from app.main.dao.users_dao import verify_password
@@ -12,6 +13,7 @@ from notifications_python_client.errors import HTTPError
 
 @main.route("/services/<service_id>/service-settings")
 @login_required
+@user_has_permissions('manage_service')
 def service_settings(service_id):
     try:
         service = get_service_by_id(service_id)['data']
@@ -29,6 +31,7 @@ def service_settings(service_id):
 
 @main.route("/services/<service_id>/service-settings/name", methods=['GET', 'POST'])
 @login_required
+@user_has_permissions('manage_service')
 def service_name_change(service_id):
     try:
         service = get_service_by_id(service_id)['data']
@@ -53,6 +56,7 @@ def service_name_change(service_id):
 
 @main.route("/services/<service_id>/service-settings/name/confirm", methods=['GET', 'POST'])
 @login_required
+@user_has_permissions('manage_service')
 def service_name_change_confirm(service_id):
     try:
         service = get_service_by_id(service_id)['data']
@@ -82,6 +86,7 @@ def service_name_change_confirm(service_id):
 
 @main.route("/services/<service_id>/service-settings/request-to-go-live", methods=['GET', 'POST'])
 @login_required
+@user_has_permissions('manage_service')
 def service_request_to_go_live(service_id):
     try:
         service = get_service_by_id(service_id)['data']
@@ -104,6 +109,7 @@ def service_request_to_go_live(service_id):
 
 @main.route("/services/<service_id>/service-settings/status", methods=['GET', 'POST'])
 @login_required
+@user_has_permissions('manage_service')
 def service_status_change(service_id):
     try:
         service = get_service_by_id(service_id)['data']
@@ -125,6 +131,7 @@ def service_status_change(service_id):
 
 @main.route("/services/<service_id>/service-settings/status/confirm", methods=['GET', 'POST'])
 @login_required
+@user_has_permissions('manage_service')
 def service_status_change_confirm(service_id):
     try:
         service = get_service_by_id(service_id)['data']
@@ -153,6 +160,7 @@ def service_status_change_confirm(service_id):
 
 @main.route("/services/<service_id>/service-settings/delete", methods=['GET', 'POST'])
 @login_required
+@user_has_permissions('manage_service')
 def service_delete(service_id):
     try:
         service = get_service_by_id(service_id)['data']
@@ -174,6 +182,7 @@ def service_delete(service_id):
 
 @main.route("/services/<service_id>/service-settings/delete/confirm", methods=['GET', 'POST'])
 @login_required
+@user_has_permissions('manage_service')
 def service_delete_confirm(service_id):
     try:
         service = get_service_by_id(service_id)['data']
diff --git a/app/main/views/templates.py b/app/main/views/templates.py
index 2c29ba46a..0b7119e9d 100644
--- a/app/main/views/templates.py
+++ b/app/main/views/templates.py
@@ -2,6 +2,7 @@ from flask import request, render_template, redirect, url_for, flash, abort
 from flask_login import login_required
 
 from app.main import main
+from app.utils import user_has_permissions
 from app.main.forms import SMSTemplateForm, EmailTemplateForm
 from app.main.dao import templates_dao as tdao
 from app.main.dao import services_dao as sdao
@@ -15,6 +16,7 @@ form_objects = {
 
 @main.route("/services/<service_id>/templates/add-<template_type>", methods=['GET', 'POST'])
 @login_required
+@user_has_permissions('manage_templates')
 def add_service_template(service_id, template_type):
 
     service = sdao.get_service_by_id_or_404(service_id)
@@ -46,6 +48,7 @@ def add_service_template(service_id, template_type):
 
 @main.route("/services/<service_id>/templates/<int:template_id>", methods=['GET', 'POST'])
 @login_required
+@user_has_permissions('manage_templates')
 def edit_service_template(service_id, template_id):
     template = tdao.get_service_template_or_404(service_id, template_id)['data']
     template['template_content'] = template['content']
@@ -73,6 +76,7 @@ def edit_service_template(service_id, template_id):
 
 @main.route("/services/<service_id>/templates/<int:template_id>/delete", methods=['GET', 'POST'])
 @login_required
+@user_has_permissions('manage_templates')
 def delete_service_template(service_id, template_id):
     template = tdao.get_service_template_or_404(service_id, template_id)['data']
 
diff --git a/app/notify_client/models.py b/app/notify_client/models.py
index 8c51666eb..df8d41306 100644
--- a/app/notify_client/models.py
+++ b/app/notify_client/models.py
@@ -1,4 +1,5 @@
 from flask.ext.login import (UserMixin, login_fresh)
+from flask import session
 
 
 class User(UserMixin):
@@ -81,8 +82,14 @@ class User(UserMixin):
     def permissions(self, permissions):
         raise AttributeError("Read only property")
 
-    def has_permissions(self, service_id, permissions):
-        return True
+    def has_permissions(self, permissions, service_id=None, or_=False):
+        if service_id is None:
+            service_id = session.get('service_id', '')
+        if service_id in self._permissions:
+            if or_:
+                return any([x in self._permissions[service_id] for x in permissions])
+            return set(self._permissions[service_id]) > set(permissions)
+        return False
 
     @property
     def failed_login_count(self):
diff --git a/app/templates/main_nav.html b/app/templates/main_nav.html
index 216bec23c..96a360727 100644
--- a/app/templates/main_nav.html
+++ b/app/templates/main_nav.html
@@ -2,20 +2,26 @@
   <h2 class="navigation-service-name">
     <a href="{{ url_for('.service_dashboard', service_id=service_id) }}">{{ session.get('service_name', 'Service') }}</a>
   </h2>
-  {% if current_user.has_permissions(session.get('service_id', ''), ['send_messages']) %}
+  {% if current_user.has_permissions(['send_messages']) %}
   <ul>
     <li><a href="{{ url_for('.choose_template', service_id=service_id, template_type='sms') }}">Send text messages</a></li>
     <li><a href="{{ url_for('.choose_template', service_id=service_id, template_type='email') }}">Send emails</a></li>
     <li><a href="{{ url_for('.letters_stub', service_id=service_id) }}">Send letters</a></li>
   </ul>
+  {% elif current_user.has_permissions(['manage_templates']) %}
+  <ul>
+    <li><a href="{{ url_for('.choose_template', service_id=service_id, template_type='sms') }}">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('.letters_stub', service_id=service_id) }}">Send letters</a></li>
+  </ul>
   {% endif %}
-  {% if current_user.has_permissions(session.get('service_id', ''), ['manage_service']) %}
+  {% if current_user.has_permissions(['manage_service']) %}
   <ul>
     <li><a href="{{ url_for('.manage_users', service_id=service_id) }}">Manage team</a></li>
     <li><a href="{{ url_for('.service_settings', service_id=service_id) }}">Manage settings</a></li>
   </ul>
   {% endif %}
-  {% if current_user.has_permissions(session.get('service_id', ''), ['manage_api_keys']) %}
+  {% 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('.documentation', service_id=service_id) }}">Developer documentation</a></li>
diff --git a/app/templates/views/choose-template.html b/app/templates/views/choose-template.html
index 7fb87b827..bf6f08f12 100644
--- a/app/templates/views/choose-template.html
+++ b/app/templates/views/choose-template.html
@@ -16,6 +16,7 @@
 
     {% if templates %}
       {% if not has_jobs %}
+        {% if current_user.has_permissions(['manage_service']) %}
         {{ banner(
           """
             Send yourself a test message
@@ -23,6 +24,7 @@
           subhead='Next step',
           type="tip"
         )}}
+        {% endif %}
       {% endif %}
       <div class="grid-row">
         {% for template in templates %}
@@ -39,9 +41,13 @@
           </div>
           <div class="column-one-third">
             <div class="sms-message-use-links">
+              {% if current_user.has_permissions(['manage_service']) %}
               <a href="{{ url_for(".send_messages", service_id=service_id, template_id=template.id) }}">Add recipients</a>
               <a href="{{ url_for(".send_message_to_self", service_id=service_id, template_id=template.id) }}">Send yourself a test</a>
+              {% endif %}
+              {% if current_user.has_permissions(['manage_templates']) %}
               <a href="{{ url_for(".edit_service_template", service_id=service_id, template_id=template.id) }}">Edit template</a>
+              {% endif %}
             </div>
           </div>
         {% endfor %}
@@ -49,7 +55,9 @@
     {% endif %}
 
     <p>
+      {% if current_user.has_permissions(['manage_templates']) %}
       <a href="{{ url_for('.add_service_template', service_id=service_id, template_type=template_type) }}" class="button">Add a new template</a>
+      {% endif %}
     </p>
 
   </form>
diff --git a/app/utils.py b/app/utils.py
index 0fd38f808..11eb18876 100644
--- a/app/utils.py
+++ b/app/utils.py
@@ -96,14 +96,12 @@ def validate_recipient(row, template_type):
     }[template_type](get_recipient_from_row(row, template_type))
 
 
-def user_has_permissions(*permissions):
+def user_has_permissions(*permissions, or_=False):
     def wrap(func):
         @wraps(func)
         def wrap_func(*args, **kwargs):
-            # We are making the assumption that the user is logged in.
             from flask_login import current_user
-            service_id = session.get('service_id', '')
-            if current_user and current_user.has_permissions(service_id, permissions):
+            if current_user and current_user.has_permissions(permissions, or_=or_):
                 return func(*args, **kwargs)
             else:
                 abort(403)
diff --git a/tests/app/main/test_utils.py b/tests/app/main/test_utils.py
index 67262c360..95b435f6e 100644
--- a/tests/app/main/test_utils.py
+++ b/tests/app/main/test_utils.py
@@ -6,18 +6,53 @@ from app.main.views.index import index
 from werkzeug.exceptions import Forbidden
 
 
-# def test_user_has_permissions(app_,
-#                               api_user_active,
-#                               mock_get_user,
-#                               mock_get_user_by_email,
-#                               mock_login):
-#     with app_.test_request_context():
-#         with app_.test_client() as client:
-#             client.login(api_user_active)
-#             decorator = user_has_permissions('something')
-#             decorated_index = decorator(index)
-#             try:
-#                 response = decorated_index()
-#                 pytest.fail("Failed to throw a forbidden exception")
-#             except Forbidden:
-#                 pass
+def test_user_has_permissions_on_endpoint_fail(app_,
+                                               api_user_active,
+                                               mock_login,
+                                               mock_get_user_with_permissions):
+    with app_.test_request_context():
+        with app_.test_client() as client:
+            client.login(api_user_active)
+            decorator = user_has_permissions('something')
+            decorated_index = decorator(index)
+            try:
+                response = decorated_index()
+                pytest.fail("Failed to throw a forbidden exception")
+            except Forbidden:
+                pass
+
+
+def test_user_has_permissions_success(app_,
+                                      api_user_active,
+                                      mock_login,
+                                      mock_get_user_with_permissions):
+    with app_.test_request_context():
+        with app_.test_client() as client:
+            client.login(api_user_active)
+            decorator = user_has_permissions('manage_users')
+            decorated_index = decorator(index)
+            response = decorated_index()
+
+
+def test_user_has_permissions_or(app_,
+                                 api_user_active,
+                                 mock_login,
+                                 mock_get_user_with_permissions):
+    with app_.test_request_context():
+        with app_.test_client() as client:
+            client.login(api_user_active)
+            decorator = user_has_permissions('something', 'manage_users', or_=True)
+            decorated_index = decorator(index)
+            response = decorated_index()
+
+
+def test_user_has_permissions_multiple(app_,
+                                       api_user_active,
+                                       mock_login,
+                                       mock_get_user_with_permissions):
+    with app_.test_request_context():
+        with app_.test_client() as client:
+            client.login(api_user_active)
+            decorator = user_has_permissions('manage_templates', 'manage_users')
+            decorated_index = decorator(index)
+            response = decorated_index()
diff --git a/tests/app/main/views/test_send.py b/tests/app/main/views/test_send.py
index 600b8c6b0..9c7e2a30f 100644
--- a/tests/app/main/views/test_send.py
+++ b/tests/app/main/views/test_send.py
@@ -17,7 +17,8 @@ def test_choose_template(
     mock_get_service,
     mock_check_verify_code,
     mock_get_service_templates,
-    mock_get_jobs
+    mock_get_jobs,
+    mock_has_permissions
 ):
     with app_.test_request_context():
         with app_.test_client() as client:
@@ -40,7 +41,8 @@ def test_upload_empty_csvfile_returns_to_upload_page(
     mock_get_service,
     mock_get_service_templates,
     mock_check_verify_code,
-    mock_get_service_template
+    mock_get_service_template,
+    mock_has_permissions
 ):
     with app_.test_request_context():
         with app_.test_client() as client:
@@ -64,7 +66,8 @@ def test_upload_csvfile_with_invalid_phone_shows_check_page_with_errors(
     mock_login,
     mock_get_service,
     mock_get_service_template,
-    mock_s3_upload
+    mock_s3_upload,
+    mock_has_permissions
 ):
 
     contents = 'phone number,name\n+44 123,test1\n+44 456,test2'
@@ -95,7 +98,8 @@ def test_upload_csvfile_removes_empty_lines_and_trailing_commas(
     mock_login,
     mock_get_service,
     mock_get_service_template,
-    mock_s3_upload
+    mock_s3_upload,
+    mock_has_permissions
 ):
 
     contents = 'phone number,name,,,\n++44 7700 900981,test1,,,\n+44 7700 900981,test2,,,\n ,,, \n ,,, \t \t \n'
@@ -127,7 +131,8 @@ def test_send_test_message_to_self(
     mock_login,
     mock_get_service,
     mock_get_service_template,
-    mock_s3_upload
+    mock_s3_upload,
+    mock_has_permissions
 ):
 
     expected_data = {'data': ['phone number', '+4412341234'], 'file_name': 'Test run'}
@@ -151,7 +156,8 @@ def test_send_test_message_to_self(
     mock_login,
     mock_get_service,
     mock_get_service_email_template,
-    mock_s3_upload
+    mock_s3_upload,
+    mock_has_permissions
 ):
 
     expected_data = {'data': ['email address', 'test@user.gov.uk'], 'file_name': 'Test run'}
@@ -174,7 +180,8 @@ def test_download_example_csv(
     api_user_active,
     mock_login,
     mock_get_service,
-    mock_get_service_template
+    mock_get_service_template,
+    mock_has_permissions
 ):
 
     with app_.test_request_context():
@@ -196,7 +203,8 @@ def test_upload_csvfile_with_valid_phone_shows_all_numbers(
     mock_login,
     mock_get_service,
     mock_get_service_template,
-    mock_s3_upload
+    mock_s3_upload,
+    mock_has_permissions
 ):
 
     contents = 'phone number\n+44 7700 900981\n+44 7700 900982\n+44 7700 900983\n+44 7700 900984\n+44 7700 900985\n+44 7700 900986'  # noqa
@@ -235,7 +243,8 @@ def test_create_job_should_call_api(
     mock_create_job,
     mock_get_job,
     mock_get_service,
-    mock_get_service_template
+    mock_get_service_template,
+    mock_has_permissions
 ):
 
     service_id = service_one['id']
diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py
index 045cc4c86..174935f2a 100644
--- a/tests/app/main/views/test_service_settings.py
+++ b/tests/app/main/views/test_service_settings.py
@@ -6,7 +6,8 @@ def test_should_show_overview(app_,
                               mock_get_service,
                               mock_get_user,
                               mock_get_user_by_email,
-                              mock_login):
+                              mock_login,
+                              mock_has_permissions):
     with app_.test_request_context():
         with app_.test_client() as client:
             client.login(api_user_active)
@@ -25,7 +26,8 @@ def test_should_show_service_name(app_,
                                   mock_get_service,
                                   mock_get_user,
                                   mock_get_user_by_email,
-                                  mock_login):
+                                  mock_login,
+                                  mock_has_permissions):
     with app_.test_request_context():
         with app_.test_client() as client:
             client.login(api_user_active)
@@ -44,7 +46,8 @@ def test_should_redirect_after_change_service_name(app_,
                                                    mock_get_service,
                                                    mock_get_user,
                                                    mock_get_user_by_email,
-                                                   mock_login):
+                                                   mock_login,
+                                                   mock_has_permissions):
     with app_.test_request_context():
         with app_.test_client() as client:
             client.login(api_user_active)
@@ -64,7 +67,8 @@ def test_should_show_service_name_confirmation(app_,
                                                mock_get_service,
                                                mock_get_user,
                                                mock_get_user_by_email,
-                                               mock_login):
+                                               mock_login,
+                                               mock_has_permissions):
     with app_.test_request_context():
         with app_.test_client() as client:
             client.login(api_user_active)
@@ -85,7 +89,8 @@ def test_should_redirect_after_service_name_confirmation(app_,
                                                          mock_get_user,
                                                          mock_get_user_by_email,
                                                          mock_login,
-                                                         mock_verify_password):
+                                                         mock_verify_password,
+                                                         mock_has_permissions):
     with app_.test_request_context():
         with app_.test_client() as client:
             client.login(api_user_active)
@@ -110,7 +115,8 @@ def test_should_show_request_to_go_live(app_,
                                         mock_get_service,
                                         mock_get_user,
                                         mock_get_user_by_email,
-                                        mock_login):
+                                        mock_login,
+                                        mock_has_permissions):
     with app_.test_request_context():
         with app_.test_client() as client:
             client.login(api_user_active)
@@ -130,7 +136,8 @@ def test_should_redirect_after_request_to_go_live(app_,
                                                   mock_update_service,
                                                   mock_get_user,
                                                   mock_get_user_by_email,
-                                                  mock_login):
+                                                  mock_login,
+                                                  mock_has_permissions):
     with app_.test_request_context():
         with app_.test_client() as client:
             client.login(api_user_active)
@@ -151,7 +158,8 @@ def test_should_show_status_page(app_,
                                  mock_get_service,
                                  mock_get_user,
                                  mock_get_user_by_email,
-                                 mock_login):
+                                 mock_login,
+                                 mock_has_permissions):
     with app_.test_request_context():
         with app_.test_client() as client:
             client.login(api_user_active)
@@ -170,7 +178,8 @@ def test_should_show_redirect_after_status_change(app_,
                                                   mock_get_service,
                                                   mock_get_user,
                                                   mock_get_user_by_email,
-                                                  mock_login):
+                                                  mock_login,
+                                                  mock_has_permissions):
     with app_.test_request_context():
         with app_.test_client() as client:
             client.login(api_user_active)
@@ -190,7 +199,8 @@ def test_should_show_status_confirmation(app_,
                                          mock_get_service,
                                          mock_get_user,
                                          mock_get_user_by_email,
-                                         mock_login):
+                                         mock_login,
+                                         mock_has_permissions):
     with app_.test_request_context():
         with app_.test_client() as client:
             client.login(api_user_active)
@@ -211,7 +221,8 @@ def test_should_redirect_after_status_confirmation(app_,
                                                    mock_get_user,
                                                    mock_get_user_by_email,
                                                    mock_login,
-                                                   mock_verify_password):
+                                                   mock_verify_password,
+                                                   mock_has_permissions):
     with app_.test_request_context():
         with app_.test_client() as client:
             client.login(api_user_active)
@@ -232,7 +243,8 @@ def test_should_show_delete_page(app_,
                                  mock_get_service,
                                  mock_get_user,
                                  mock_get_user_by_email,
-                                 mock_login):
+                                 mock_login,
+                                 mock_has_permissions):
     with app_.test_request_context():
         with app_.test_client() as client:
             client.login(api_user_active)
@@ -250,7 +262,8 @@ def test_should_show_redirect_after_deleting_service(app_,
                                                      mock_get_service,
                                                      mock_get_user,
                                                      mock_get_user_by_email,
-                                                     mock_login):
+                                                     mock_login,
+                                                     mock_has_permissions):
     with app_.test_request_context():
         with app_.test_client() as client:
             client.login(api_user_active)
@@ -269,7 +282,8 @@ def test_should_show_delete_confirmation(app_,
                                          mock_get_service,
                                          mock_get_user,
                                          mock_get_user_by_email,
-                                         mock_login):
+                                         mock_login,
+                                         mock_has_permissions):
     with app_.test_request_context():
         with app_.test_client() as client:
             client.login(api_user_active)
@@ -289,7 +303,8 @@ def test_should_redirect_delete_confirmation(app_,
                                              mock_get_user,
                                              mock_get_user_by_email,
                                              mock_login,
-                                             mock_verify_password):
+                                             mock_verify_password,
+                                             mock_has_permissions):
     with app_.test_request_context():
         with app_.test_client() as client:
             client.login(api_user_active)
diff --git a/tests/app/main/views/test_templates.py b/tests/app/main/views/test_templates.py
index 1ec43d502..cff04bde1 100644
--- a/tests/app/main/views/test_templates.py
+++ b/tests/app/main/views/test_templates.py
@@ -9,7 +9,8 @@ def test_should_show_page_for_one_templates(app_,
                                             mock_get_service_template,
                                             mock_get_user,
                                             mock_get_user_by_email,
-                                            mock_login):
+                                            mock_login,
+                                            mock_has_permissions):
     with app_.test_request_context():
         with app_.test_client() as client:
             client.login(api_user_active)
@@ -33,7 +34,8 @@ def test_should_redirect_when_saving_a_template(app_,
                                                 mock_update_service_template,
                                                 mock_get_user,
                                                 mock_get_user_by_email,
-                                                mock_login):
+                                                mock_login,
+                                                mock_has_permissions):
     with app_.test_request_context():
         with app_.test_client() as client:
             client.login(api_user_active)
@@ -65,7 +67,8 @@ def test_should_show_delete_template_page(app_,
                                           mock_get_service_template,
                                           mock_get_user,
                                           mock_get_user_by_email,
-                                          mock_login):
+                                          mock_login,
+                                          mock_has_permissions):
     with app_.test_request_context():
         with app_.test_client() as client:
             client.login(api_user_active)
@@ -91,7 +94,8 @@ def test_should_redirect_when_deleting_a_template(app_,
                                                   mock_delete_service_template,
                                                   mock_get_user,
                                                   mock_get_user_by_email,
-                                                  mock_login):
+                                                  mock_login,
+                                                  mock_has_permissions):
     with app_.test_request_context():
         with app_.test_client() as client:
             client.login(api_user_active)
diff --git a/tests/conftest.py b/tests/conftest.py
index 152621b2f..24471d539 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -316,6 +316,15 @@ def mock_get_user_by_email(mocker, api_user_active):
     return mocker.patch('app.user_api_client.get_user_by_email', side_effect=_get_user)
 
 
+@pytest.fixture(scope='function')
+def mock_get_user_with_permissions(mocker, api_user_active):
+    def _get_user(id):
+        api_user_active._permissions[''] = ['manage_users', 'manage_templates', 'manage_settings']
+        return api_user_active
+    return mocker.patch(
+        'app.user_api_client.get_user', side_effect=_get_user)
+
+
 @pytest.fixture(scope='function')
 def mock_dont_get_user_by_email(mocker):
 
@@ -534,7 +543,7 @@ def mock_get_jobs(mocker):
 
 @pytest.fixture(scope='function')
 def mock_has_permissions(mocker):
-    def _has_permission(service_id, permissions):
+    def _has_permission(permissions, service_id=None, or_=False):
         return True
     return mocker.patch(
         'app.notify_client.user_api_client.User.has_permissions',