diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py
index 0774c1e5d..f77833b7d 100644
--- a/app/main/views/service_settings.py
+++ b/app/main/views/service_settings.py
@@ -1,3 +1,4 @@
+from collections import OrderedDict
 from datetime import datetime
 
 import pytz
@@ -42,6 +43,7 @@ from app.main.forms import (
     ServiceEditInboundNumberForm,
     ServiceInboundNumberForm,
     ServiceLetterContactBlockForm,
+    ServiceOnOffSettingForm,
     ServicePreviewBranding,
     ServiceReplyToEmailForm,
     ServiceSetEmailBranding,
@@ -60,11 +62,22 @@ from app.utils import (
 )
 
 
+PLATFORM_ADMIN_SERVICE_PERMISSIONS = OrderedDict([
+    ('inbound_sms', {'title': 'Receive inbound SMS', 'requires': 'sms', 'endpoint': '.service_set_inbound_number'}),
+    ('precompiled_letter', {'title': 'Send precompiled letters', 'requires': 'letter'}),
+    ('email_auth', {'title': 'User auth type editing'}),
+    ('upload_document', {'title': 'Uploading documents', 'endpoint': '.service_switch_can_upload_document'}),
+])
+
+
 @main.route("/services/<service_id>/service-settings")
 @login_required
 @user_has_permissions('manage_service', 'manage_api_keys')
 def service_settings(service_id):
-    return render_template('views/service-settings.html')
+    return render_template(
+        'views/service-settings.html',
+        service_permissions=PLATFORM_ADMIN_SERVICE_PERMISSIONS
+    )
 
 
 @main.route("/services/<service_id>/service-settings/name", methods=['GET', 'POST'])
@@ -211,54 +224,64 @@ def submit_request_to_go_live(service_id):
     return render_template('views/service-settings/submit-request-to-go-live.html', form=form)
 
 
-@main.route("/services/<service_id>/service-settings/switch-live")
+@main.route("/services/<service_id>/service-settings/switch-live", methods=["GET", "POST"])
 @login_required
 @user_is_platform_admin
 def service_switch_live(service_id):
-    current_service.update(
-        # TODO This limit should be set depending on the agreement signed by
-        # with Notify.
-        message_limit=250000 if current_service.trial_mode else 50,
-        restricted=(not current_service.trial_mode)
+    form = ServiceOnOffSettingForm(
+        name="Make service live",
+        enabled=not current_service.trial_mode
+    )
+
+    if form.validate_on_submit():
+        current_service.update(
+            # TODO This limit should be set depending on the agreement signed by
+            # with Notify.
+            message_limit=250000 if form.enabled.data else 50,
+            restricted=(not form.enabled.data)
+        )
+        return redirect(url_for('.service_settings', service_id=service_id))
+
+    return render_template(
+        'views/service-settings/set-service-setting.html',
+        title="Make service live",
+        form=form,
     )
-    return redirect(url_for('.service_settings', service_id=service_id))
 
 
-@main.route("/services/<service_id>/service-settings/research-mode")
+@main.route("/services/<service_id>/service-settings/permissions/<permission>", methods=["GET", "POST"])
 @login_required
 @user_is_platform_admin
-def service_switch_research_mode(service_id):
-    current_service.toggle_research_mode()
-    return redirect(url_for('.service_settings', service_id=service_id))
+def service_set_permission(service_id, permission):
+    if permission not in PLATFORM_ADMIN_SERVICE_PERMISSIONS:
+        abort(404)
 
+    title = PLATFORM_ADMIN_SERVICE_PERMISSIONS[permission]['title']
+    form = ServiceOnOffSettingForm(
+        name=title,
+        enabled=current_service.has_permission(permission)
+    )
 
-@main.route("/services/<service_id>/service-settings/email-auth")
-@login_required
-@user_is_platform_admin
-def service_switch_email_auth(service_id):
-    current_service.switch_permission('email_auth')
-    return redirect(url_for('.service_settings', service_id=service_id))
+    if form.validate_on_submit():
+        current_service.force_permission(permission, on=form.enabled.data)
 
+        return redirect(url_for(".service_settings", service_id=service_id))
 
-@main.route("/services/<service_id>/service-settings/can-send-precompiled-letter")
-@login_required
-@user_is_platform_admin
-def service_switch_can_send_precompiled_letter(service_id):
-    current_service.switch_permission('precompiled_letter')
-    return redirect(url_for('.service_settings', service_id=service_id))
+    return render_template(
+        'views/service-settings/set-service-setting.html',
+        title=title,
+        form=form,
+    )
 
 
 @main.route("/services/<service_id>/service-settings/can-upload-document", methods=['GET', 'POST'])
 @login_required
 @user_is_platform_admin
 def service_switch_can_upload_document(service_id):
-    form = ServiceContactDetailsForm()
+    if current_service.contact_link:
+        return redirect(url_for('.service_set_permission', service_id=service_id, permission='upload_document'))
 
-    # If turning the permission off, or turning it on and the service already has a contact_link,
-    # don't show the form to add the link
-    if current_service.has_permission('upload_document') or current_service.contact_link:
-        current_service.switch_permission('upload_document')
-        return redirect(url_for('.service_settings', service_id=service_id))
+    form = ServiceContactDetailsForm()
 
     if form.validate_on_submit():
         contact_type = form.contact_details_type.data
@@ -266,8 +289,8 @@ def service_switch_can_upload_document(service_id):
         current_service.update(
             contact_link=form.data[contact_type]
         )
-        current_service.switch_permission('upload_document')
-        return redirect(url_for('.service_settings', service_id=service_id))
+
+        return redirect(url_for('.service_set_permission', service_id=service_id, permission='upload_document'))
 
     return render_template('views/service-settings/contact_link.html', form=form)
 
@@ -425,6 +448,7 @@ def service_set_inbound_number(service_id):
     form = ServiceInboundNumberForm(
         inbound_number_choices=inbound_numbers_value_and_label
     )
+
     if form.validate_on_submit():
         service_api_client.add_sms_sender(
             current_service.id,
@@ -434,6 +458,7 @@ def service_set_inbound_number(service_id):
         )
         current_service.force_permission('inbound_sms', on=True)
         return redirect(url_for('.service_settings', service_id=service_id))
+
     return render_template(
         'views/service-settings/set-inbound-number.html',
         form=form,
diff --git a/app/navigation.py b/app/navigation.py
index e5dbca7ab..6bcaf66ae 100644
--- a/app/navigation.py
+++ b/app/navigation.py
@@ -246,11 +246,9 @@ class HeaderNavigation(Navigation):
         'service_set_sms_prefix',
         'service_settings',
         'service_sms_senders',
-        'service_switch_can_send_precompiled_letter',
         'service_switch_can_upload_document',
-        'service_switch_email_auth',
         'service_switch_live',
-        'service_switch_research_mode',
+        'service_set_permission',
         'services_or_dashboard',
         'set_free_sms_allowance',
         'set_organisation_type',
@@ -479,11 +477,9 @@ class MainNavigation(Navigation):
         'service_dashboard_updates',
         'service_delete_email_reply_to',
         'service_delete_sms_sender',
-        'service_switch_can_send_precompiled_letter',
         'service_switch_can_upload_document',
-        'service_switch_email_auth',
         'service_switch_live',
-        'service_switch_research_mode',
+        'service_set_permission',
         'services_or_dashboard',
         'show_accounts_or_dashboard',
         'sign_in',
@@ -707,11 +703,9 @@ class CaseworkNavigation(Navigation):
         'service_set_sms_prefix',
         'service_settings',
         'service_sms_senders',
-        'service_switch_can_send_precompiled_letter',
         'service_switch_can_upload_document',
-        'service_switch_email_auth',
         'service_switch_live',
-        'service_switch_research_mode',
+        'service_set_permission',
         'services_or_dashboard',
         'set_free_sms_allowance',
         'service_set_letter_branding',
@@ -943,11 +937,9 @@ class OrgNavigation(Navigation):
         'service_set_sms_prefix',
         'service_settings',
         'service_sms_senders',
-        'service_switch_can_send_precompiled_letter',
         'service_switch_can_upload_document',
-        'service_switch_email_auth',
         'service_switch_live',
-        'service_switch_research_mode',
+        'service_set_permission',
         'services_or_dashboard',
         'set_free_sms_allowance',
         'service_set_letter_branding',
diff --git a/app/templates/views/service-settings.html b/app/templates/views/service-settings.html
index 92ecbc8a3..896066802 100644
--- a/app/templates/views/service-settings.html
+++ b/app/templates/views/service-settings.html
@@ -285,6 +285,13 @@
         field_headings_visible=False,
         caption_visible=False
       ) %}
+
+        {% call row() %}
+          {{ text_field('Live')}}
+          {{ boolean_field(not current_service.trial_mode) }}
+          {{ edit_field('Change', url_for('.service_switch_live', service_id=current_service.id)) }}
+        {% endcall %}
+
         {% call row() %}
           {{ text_field('Organisation')}}
           {{ optional_text_field(current_service.organisation_name) }}
@@ -319,45 +326,20 @@
           {% endcall %}
           {{ edit_field('Change', url_for('.data_retention', service_id=current_service.id)) }}
         {% endcall %}
+
+        {% for permission in service_permissions %}
+          {% if not service_permissions[permission].requires or current_service.has_permission(service_permissions[permission].requires) %}
+            {% call row() %}
+              {{ text_field(service_permissions[permission].title)}}
+              {{ boolean_field(current_service.has_permission(permission)) }}
+              {{ edit_field('Change', url_for(service_permissions[permission].endpoint or '.service_set_permission', service_id=current_service.id, permission=permission if not service_permissions[permission].endpoint else None)) }}
+            {% endcall %}
+          {% endif %}
+        {% endfor %}
+
       {% endcall %}
 
       <ul>
-        <li class="bottom-gutter">
-          <a href="{{ url_for('.service_switch_live', service_id=current_service.id) }}" class="button">
-            {{ 'Make service live' if current_service.trial_mode else 'Revert service to trial mode' }}
-          </a>
-        </li>
-        <li class="bottom-gutter">
-          <a href="{{ url_for('.service_switch_research_mode', service_id=current_service.id) }}" class="button">
-            {{ 'Take service out of research mode' if current_service.research_mode else 'Put into research mode' }}
-          </a>
-        </li>
-        {% if 'sms' in current_service.permissions %}
-          <li class="bottom-gutter">
-          {% if not current_service.has_permission('inbound_sms') %}
-            <a href="{{ url_for('.service_set_inbound_number', service_id=current_service.id, set_inbound_sms=True) }}" class="button">
-              Allow inbound sms
-            </a>
-          {% endif %}
-          </li>
-        {% endif %}
-        {% if 'letter' in current_service.permissions %}
-          <li class="bottom-gutter">
-            <a href="{{ url_for('.service_switch_can_send_precompiled_letter', service_id=current_service.id) }}" class="button">
-              {{ 'Stop sending precompiled letters' if 'precompiled_letter' in current_service.permissions else 'Allow to send precompiled letters' }}
-            </a>
-          </li>
-        {% endif %}
-        <li class="bottom-gutter">
-          <a href="{{ url_for('.service_switch_email_auth', service_id=current_service.id) }}" class="button">
-            {{ 'Stop user auth type editing' if 'email_auth' in current_service.permissions else 'Allow user auth type editing' }}
-          </a>
-        </li>
-        <li class="bottom-gutter">
-           <a href="{{ url_for('.service_switch_can_upload_document', service_id=current_service.id) }}" class="button">
-             {{ 'Stop uploading documents' if 'upload_document' in current_service.permissions else 'Allow to upload documents' }}
-           </a>
-        </li>
         {% if current_service.active %}
           <li class="bottom-gutter">
             <a href="{{ url_for('.archive_service', service_id=current_service.id) }}" class="button">
diff --git a/app/templates/views/service-settings/set-service-setting.html b/app/templates/views/service-settings/set-service-setting.html
new file mode 100644
index 000000000..763f0f9fb
--- /dev/null
+++ b/app/templates/views/service-settings/set-service-setting.html
@@ -0,0 +1,26 @@
+{% extends "withnav_template.html" %}
+{% from "components/radios.html" import radios %}
+{% from "components/page-footer.html" import page_footer %}
+{% from "components/form.html" import form_wrapper %}
+
+{% block service_page_title %}
+  Send letters
+{% endblock %}
+
+{% block maincolumn_content %}
+
+  <div class="grid-row">
+    <div class="column-five-sixths">
+      <h1 class="heading-large">{{ title }}</h1>
+      {% call form_wrapper() %}
+        {{ radios(form.enabled, hide_legend=True) }}
+        {{ page_footer(
+          'Save',
+          back_link=url_for('.service_settings', service_id=current_service.id),
+          back_link_text='Back to settings'
+        ) }}
+      {% endcall %}
+    </div>
+  </div>
+
+{% endblock %}
diff --git a/tests/app/main/views/service_settings/test_service_setting_permissions.py b/tests/app/main/views/service_settings/test_service_setting_permissions.py
index 76a540ca1..37dcae240 100644
--- a/tests/app/main/views/service_settings/test_service_setting_permissions.py
+++ b/tests/app/main/views/service_settings/test_service_setting_permissions.py
@@ -3,6 +3,8 @@ import functools
 import pytest
 from flask import url_for
 
+from tests.conftest import normalize_spaces
+
 
 @pytest.fixture
 def get_service_settings_page(
@@ -22,59 +24,107 @@ def get_service_settings_page(
     return functools.partial(client_request.get, 'main.service_settings', service_id=service_one['id'])
 
 
-@pytest.mark.parametrize('service_fields, endpoint, kwargs, text', [
-    ({'restricted': True}, '.service_switch_live', {}, 'Make service live'),
-    ({'restricted': False}, '.service_switch_live', {}, 'Revert service to trial mode'),
+def test_service_set_permission_requires_platform_admin(
+    mocker,
+    client_request,
+    service_one,
+    mock_get_inbound_number_for_service,
+):
+    client_request.post(
+        'main.service_set_permission', service_id=service_one['id'], permission='upload_document',
+        _data={'enabled': 'True'},
+        _expected_status=403
+    )
 
-    ({'research_mode': True}, '.service_switch_research_mode', {}, 'Take service out of research mode'),
-    ({'research_mode': False}, '.service_switch_research_mode', {}, 'Put into research mode'),
+
+@pytest.mark.parametrize('permission, form_data, on', [
+    ('upload_document', 'True', True),
+    ('upload_document', 'False', False),
+    ('precompiled_letter', 'True', True),
+    ('precompiled_letter', 'False', False),
+    ('inbound_sms', 'True', True),
+    ('inbound_sms', 'False', False),
+    ('email_auth', 'True', True),
+    ('email_auth', 'False', False),
+])
+def test_service_set_permission(
+    mocker,
+    logged_in_platform_admin_client,
+    service_one,
+    mock_get_inbound_number_for_service,
+    permission,
+    form_data,
+    on
+):
+    force_permission = mocker.patch('app.models.service.Service.force_permission')
+    response = logged_in_platform_admin_client.post(
+        url_for('main.service_set_permission', service_id=service_one['id'], permission=permission),
+        data={'enabled': form_data}
+    )
+    assert response.status_code == 302
+    assert response.location == url_for('main.service_settings', service_id=service_one['id'], _external=True)
+    force_permission.assert_called_with(
+        permission, on=on
+    )
+
+
+@pytest.mark.parametrize('service_fields, endpoint, kwargs, text', [
+    ({'restricted': True}, '.service_switch_live', {}, 'Live Off Change'),
+    ({'restricted': False}, '.service_switch_live', {}, 'Live On Change'),
 
     ({'permissions': ['letter', 'precompiled_letter']},
-        '.service_switch_can_send_precompiled_letter', {}, 'Stop sending precompiled letters'),
+     '.service_set_permission', {'permission': 'precompiled_letter'}, 'Send precompiled letters On Change'),
     ({'permissions': ['letter']},
-        '.service_switch_can_send_precompiled_letter', {}, 'Allow to send precompiled letters'),
+     '.service_set_permission', {'permission': 'precompiled_letter'}, 'Send precompiled letters Off Change'),
 
     ({'permissions': ['upload_document']},
-        '.service_switch_can_upload_document', {}, 'Stop uploading documents'),
+     '.service_switch_can_upload_document', {}, 'Uploading documents On Change'),
     ({'permissions': []},
-        '.service_switch_can_upload_document', {}, 'Allow to upload documents'),
-    ({'permissions': ['sms']}, '.service_set_inbound_number', {'set_inbound_sms': True}, 'Allow inbound sms'),
-
-    ({'active': True}, '.archive_service', {}, 'Archive service'),
-    ({'active': True}, '.suspend_service', {}, 'Suspend service'),
-    ({'active': False}, '.resume_service', {}, 'Resume service'),
+     '.service_switch_can_upload_document', {}, 'Uploading documents Off Change'),
+    ({'permissions': ['sms']}, '.service_set_inbound_number', {}, 'Receive inbound SMS Off Change'),
 ])
 def test_service_setting_toggles_show(get_service_settings_page, service_one, service_fields, endpoint, kwargs, text):
     button_url = url_for(endpoint, **kwargs, service_id=service_one['id'])
     service_one.update(service_fields)
     page = get_service_settings_page()
-    assert page.find('a', {'class': 'button', 'href': button_url}).text.strip() == text
+    assert normalize_spaces(page.find('a', {'href': button_url}).find_parent('tr').text.strip()) == text
 
 
-@pytest.mark.parametrize('permissions,permissions_text', [
-    ('inbound_sms', 'inbound sms'),                 # no sms parent permission
-    ('precompiled_letter', 'precompiled letters'),  # no letter parent permission
+@pytest.mark.parametrize('service_fields, endpoint, kwargs, text', [
+    ({'active': True}, '.archive_service', {}, 'Archive service'),
+    ({'active': True}, '.suspend_service', {}, 'Suspend service'),
+    ({'active': False}, '.resume_service', {}, 'Resume service'),
+])
+def test_service_setting_button_toggles(get_service_settings_page, service_one, service_fields, endpoint, kwargs, text):
+    button_url = url_for(endpoint, **kwargs, service_id=service_one['id'])
+    service_one.update(service_fields)
+    page = get_service_settings_page()
+    assert normalize_spaces(page.find('a', {'class': 'button', 'href': button_url}).text.strip()) == text
+
+
+@pytest.mark.parametrize('permissions,permissions_text,visible', [
+    ('sms', 'inbound SMS', True),
+    ('inbound_sms', 'inbound SMS', False),                 # no sms parent permission
+    ('letter', 'precompiled letters', True),
+    ('precompiled_letter', 'precompiled letters', False),  # no letter parent permission
     # also test no permissions set
-    ('', 'inbound sms'),
-    ('', 'precompiled letters')
+    ('', 'inbound SMS', False),
+    ('', 'precompiled letters', False)
 ])
 def test_service_settings_doesnt_show_option_if_parent_permission_disabled(
     get_service_settings_page,
     service_one,
     permissions,
-    permissions_text
+    permissions_text,
+    visible
 ):
     service_one['permissions'] = [permissions]
     page = get_service_settings_page()
-    toggles = page.find_all('a', {'class': 'button'})
-    assert not any(button for button in toggles if permissions_text in button.text)
+    cells = page.find_all('td')
+    assert any(cell for cell in cells if permissions_text in cell.text) is visible
 
 
 @pytest.mark.parametrize('service_fields, hidden_button_text', [
-    # if no sms permission, inbound sms shouldn't show
-    ({'permissions': ['inbound_sms']}, 'Stop inbound sms'),
-    ({'permissions': []}, 'Allow inbound sms'),
-
     # can't archive or suspend inactive service. Can't resume active service.
     ({'active': False}, 'Archive service'),
     ({'active': False}, 'Suspend service'),
diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py
index 690db6e37..805c600f7 100644
--- a/tests/app/main/views/test_service_settings.py
+++ b/tests/app/main/views/test_service_settings.py
@@ -92,12 +92,16 @@ def mock_get_service_settings_page_common(
         'Send letters Off Change',
 
         'Label Value Action',
+        'Live Off Change',
         'Organisation Org 1 Change',
         'Organisation type Central Change',
         'Free text message allowance 250,000 Change',
         'Email branding GOV.UK Change',
         'Letter branding Not set Change',
-        'Data retention email Change'
+        'Data retention email Change',
+        'Receive inbound SMS Off Change',
+        'User auth type editing Off Change',
+        'Uploading documents Off Change',
 
     ]),
 ])
@@ -382,8 +386,10 @@ def test_switch_service_to_live(
         mock_update_service,
         mock_get_inbound_number_for_service
 ):
-    response = logged_in_platform_admin_client.get(
-        url_for('main.service_switch_live', service_id=service_one['id']))
+    response = logged_in_platform_admin_client.post(
+        url_for('main.service_switch_live', service_id=service_one['id']),
+        data={'enabled': 'True'}
+    )
     assert response.status_code == 302
     assert response.location == url_for(
         'main.service_settings',
@@ -418,8 +424,11 @@ def test_switch_service_to_restricted(
         mock_update_service,
         mock_get_inbound_number_for_service,
 ):
-    response = logged_in_platform_admin_client.get(
-        url_for('main.service_switch_live', service_id=service_one['id']))
+    response = logged_in_platform_admin_client.post(
+        url_for('main.service_switch_live', service_id=service_one['id']),
+        data={'enabled': 'False'}
+
+    )
     assert response.status_code == 302
     assert response.location == url_for(
         'main.service_settings',
@@ -1110,7 +1119,6 @@ def test_route_permissions(
     'main.request_to_go_live',
     'main.submit_request_to_go_live',
     'main.service_switch_live',
-    'main.service_switch_research_mode',
     'main.archive_service',
 ])
 def test_route_invalid_permissions(
@@ -1164,30 +1172,6 @@ def test_route_for_platform_admin(
                               service_one)
 
 
-@pytest.mark.parametrize('route', [
-    'main.service_switch_live',
-    'main.service_switch_research_mode',
-])
-def test_route_for_platform_admin_update_service(
-        mocker,
-        app_,
-        client,
-        platform_admin_user,
-        service_one,
-        mock_get_all_letter_branding,
-        route,
-):
-    mocker.patch('app.service_api_client.archive_service')
-    validate_route_permission(mocker,
-                              app_,
-                              "GET",
-                              302,
-                              url_for(route, service_id=service_one['id']),
-                              [],
-                              platform_admin_user,
-                              service_one)
-
-
 def test_and_more_hint_appears_on_settings_with_more_than_just_a_single_sender(
         client_request,
         service_one,
@@ -1910,47 +1894,6 @@ def test_inbound_sms_sender_is_not_editable(
         ) == "GOVUK This phone number receives replies and can’t be changed"
 
 
-def test_switch_service_to_research_mode(
-    logged_in_platform_admin_client,
-    platform_admin_user,
-    service_one,
-    mocker,
-):
-    mocker.patch('app.service_api_client.post', return_value=service_one)
-    response = logged_in_platform_admin_client.get(
-        url_for('main.service_switch_research_mode', service_id=service_one['id'])
-    )
-    assert response.status_code == 302
-    assert response.location == url_for('main.service_settings', service_id=service_one['id'], _external=True)
-    app.service_api_client.post.assert_called_with(
-        '/service/{}'.format(service_one['id']),
-        {
-            'research_mode': True,
-            'created_by': platform_admin_user.id
-        }
-    )
-
-
-def test_switch_service_from_research_mode_to_normal(
-    logged_in_platform_admin_client,
-    mocker,
-):
-    service = service_json(
-        research_mode=True
-    )
-    mocker.patch('app.service_api_client.get_service', return_value={"data": service})
-    update_service_mock = mocker.patch('app.service_api_client.update_service', return_value=service)
-
-    response = logged_in_platform_admin_client.get(
-        url_for('main.service_switch_research_mode', service_id=service['id'])
-    )
-    assert response.status_code == 302
-    assert response.location == url_for('main.service_settings', service_id=service['id'], _external=True)
-    update_service_mock.assert_called_with(
-        service['id'], research_mode=False
-    )
-
-
 def test_shows_research_mode_indicator(
     logged_in_client,
     service_one,
@@ -2652,10 +2595,9 @@ def test_switch_service_enable_international_sms(
 
 @pytest.mark.parametrize('start_permissions, contact_details, end_permissions', [
     (['upload_document'], 'http://example.com/', []),
-    (['upload_document'], None, []),
     ([], '0207 123 4567', ['upload_document']),
 ])
-def test_service_switch_can_upload_document_changes_the_permission_if_service_contact_details_exist(
+def test_service_switch_can_upload_document_shows_permission_page_if_service_contact_details_exist(
     logged_in_platform_admin_client,
     service_one,
     mock_update_service,
@@ -2676,11 +2618,7 @@ def test_service_switch_can_upload_document_changes_the_permission_if_service_co
         follow_redirects=True
     )
     page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
-    mock_update_service.assert_called_once_with(
-        SERVICE_ONE_ID,
-        permissions=end_permissions,
-    )
-    assert normalize_spaces(page.h1.text) == 'Settings'
+    assert normalize_spaces(page.h1.text) == 'Uploading documents'
 
 
 def test_service_switch_can_upload_document_turning_permission_on_with_no_contact_details_shows_form(
@@ -2707,7 +2645,7 @@ def test_service_switch_can_upload_document_turning_permission_on_with_no_contac
     ('email_address', 'old@example.com'),
     ('phone_number', '0207 12345'),
 ])
-def test_service_switch_can_upload_document_lets_contact_details_be_added_and_switches_permission(
+def test_service_switch_can_upload_document_lets_contact_details_be_added_and_shows_permission_page(
     logged_in_platform_admin_client,
     service_one,
     mock_update_service,
@@ -2728,8 +2666,7 @@ def test_service_switch_can_upload_document_lets_contact_details_be_added_and_sw
     )
     page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
 
-    assert 'upload_document' in mock_update_service.call_args[1]['permissions']
-    assert normalize_spaces(page.h1.text) == 'Settings'
+    assert normalize_spaces(page.h1.text) == 'Uploading documents'
 
 
 def test_archive_service_after_confirm(