diff --git a/app/notify_client/api_key_api_client.py b/app/notify_client/api_key_api_client.py
index 0e79a137d..f77e0796d 100644
--- a/app/notify_client/api_key_api_client.py
+++ b/app/notify_client/api_key_api_client.py
@@ -12,10 +12,8 @@ class ApiKeyApiClient(NotifyAdminAPIClient):
 
     def init_app(self, app):
         self.base_url = app.config['API_HOST_NAME']
-        self.api_key = '{}-{}'.format(
-            app.config['ADMIN_CLIENT_USER_NAME'],
-            app.config['ADMIN_CLIENT_SECRET'],
-        )
+        self.service_id = app.config['ADMIN_CLIENT_USER_NAME']
+        self.api_key = app.config['ADMIN_CLIENT_SECRET']
 
     def get_api_keys(self, service_id, key_id=None):
         if key_id:
diff --git a/app/notify_client/events_api_client.py b/app/notify_client/events_api_client.py
index a6fcd8a5d..859f22c85 100644
--- a/app/notify_client/events_api_client.py
+++ b/app/notify_client/events_api_client.py
@@ -7,10 +7,8 @@ class EventsApiClient(NotifyAdminAPIClient):
 
     def init_app(self, app):
         self.base_url = app.config['API_HOST_NAME']
-        self.api_key = '{}-{}'.format(
-            app.config['ADMIN_CLIENT_USER_NAME'],
-            app.config['ADMIN_CLIENT_SECRET'],
-        )
+        self.service_id = app.config['ADMIN_CLIENT_USER_NAME']
+        self.api_key = app.config['ADMIN_CLIENT_SECRET']
 
     def create_event(self, event_type, event_data):
         data = {
diff --git a/app/notify_client/invite_api_client.py b/app/notify_client/invite_api_client.py
index 96116c32f..eae4fc2d6 100644
--- a/app/notify_client/invite_api_client.py
+++ b/app/notify_client/invite_api_client.py
@@ -9,10 +9,8 @@ class InviteApiClient(NotifyAdminAPIClient):
 
     def init_app(self, app):
         self.base_url = app.config['API_HOST_NAME']
-        self.api_key = '{}-{}'.format(
-            app.config['ADMIN_CLIENT_USER_NAME'],
-            app.config['ADMIN_CLIENT_SECRET'],
-        )
+        self.service_id = app.config['ADMIN_CLIENT_USER_NAME']
+        self.api_key = app.config['ADMIN_CLIENT_SECRET']
 
     def create_invite(self, invite_from_id, service_id, email_address, permissions):
         data = {
diff --git a/app/notify_client/job_api_client.py b/app/notify_client/job_api_client.py
index 8aa8c38a8..339032fb3 100644
--- a/app/notify_client/job_api_client.py
+++ b/app/notify_client/job_api_client.py
@@ -21,10 +21,8 @@ class JobApiClient(NotifyAdminAPIClient):
 
     def init_app(self, app):
         self.base_url = app.config['API_HOST_NAME']
-        self.api_key = '{}-{}'.format(
-            app.config['ADMIN_CLIENT_USER_NAME'],
-            app.config['ADMIN_CLIENT_SECRET'],
-        )
+        self.service_id = app.config['ADMIN_CLIENT_USER_NAME']
+        self.api_key = app.config['ADMIN_CLIENT_SECRET']
 
     @staticmethod
     def __convert_statistics(job):
diff --git a/app/notify_client/letter_jobs_client.py b/app/notify_client/letter_jobs_client.py
index b37b68375..62b2a7c93 100644
--- a/app/notify_client/letter_jobs_client.py
+++ b/app/notify_client/letter_jobs_client.py
@@ -8,10 +8,8 @@ class LetterJobsClient(NotifyAdminAPIClient):
 
     def init_app(self, app):
         self.base_url = app.config['API_HOST_NAME']
-        self.api_key = '{}-{}'.format(
-            app.config['ADMIN_CLIENT_USER_NAME'],
-            app.config['ADMIN_CLIENT_SECRET'],
-        )
+        self.service_id = app.config['ADMIN_CLIENT_USER_NAME']
+        self.api_key = app.config['ADMIN_CLIENT_SECRET']
 
     def get_letter_jobs(self):
         return self.get(url='/letter-jobs')['data']
diff --git a/app/notify_client/notification_api_client.py b/app/notify_client/notification_api_client.py
index 917756af1..f39ff33d0 100644
--- a/app/notify_client/notification_api_client.py
+++ b/app/notify_client/notification_api_client.py
@@ -7,10 +7,8 @@ class NotificationApiClient(NotifyAdminAPIClient):
 
     def init_app(self, app):
         self.base_url = app.config['API_HOST_NAME']
-        self.api_key = '{}-{}'.format(
-            app.config['ADMIN_CLIENT_USER_NAME'],
-            app.config['ADMIN_CLIENT_SECRET'],
-        )
+        self.service_id = app.config['ADMIN_CLIENT_USER_NAME']
+        self.api_key = app.config['ADMIN_CLIENT_SECRET']
 
     def get_notifications_for_service(
         self,
diff --git a/app/notify_client/organisations_client.py b/app/notify_client/organisations_client.py
index b5fab3810..bf4717976 100644
--- a/app/notify_client/organisations_client.py
+++ b/app/notify_client/organisations_client.py
@@ -8,10 +8,8 @@ class OrganisationsClient(NotifyAdminAPIClient):
 
     def init_app(self, app):
         self.base_url = app.config['API_HOST_NAME']
-        self.api_key = '{}-{}'.format(
-            app.config['ADMIN_CLIENT_USER_NAME'],
-            app.config['ADMIN_CLIENT_SECRET'],
-        )
+        self.service_id = app.config['ADMIN_CLIENT_USER_NAME']
+        self.api_key = app.config['ADMIN_CLIENT_SECRET']
 
     def get_organisation(self, id):
         return self.get(url='/organisation/{}'.format(id))
diff --git a/app/notify_client/provider_client.py b/app/notify_client/provider_client.py
index 464219b38..f52be66b1 100644
--- a/app/notify_client/provider_client.py
+++ b/app/notify_client/provider_client.py
@@ -8,10 +8,8 @@ class ProviderClient(NotifyAdminAPIClient):
 
     def init_app(self, app):
         self.base_url = app.config['API_HOST_NAME']
-        self.api_key = '{}-{}'.format(
-            app.config['ADMIN_CLIENT_USER_NAME'],
-            app.config['ADMIN_CLIENT_SECRET'],
-        )
+        self.service_id = app.config['ADMIN_CLIENT_USER_NAME']
+        self.api_key = app.config['ADMIN_CLIENT_SECRET']
 
     def get_all_providers(self):
         return self.get(
diff --git a/app/notify_client/service_api_client.py b/app/notify_client/service_api_client.py
index db54c91d3..b72fe77c9 100644
--- a/app/notify_client/service_api_client.py
+++ b/app/notify_client/service_api_client.py
@@ -14,10 +14,8 @@ class ServiceAPIClient(NotifyAdminAPIClient):
 
     def init_app(self, application):
         self.base_url = application.config['API_HOST_NAME']
-        self.api_key = '{}-{}'.format(
-            application.config['ADMIN_CLIENT_USER_NAME'],
-            application.config['ADMIN_CLIENT_SECRET'],
-        )
+        self.service_id = application.config['ADMIN_CLIENT_USER_NAME']
+        self.api_key = application.config['ADMIN_CLIENT_SECRET']
 
     def create_service(self, service_name, message_limit, restricted, user_id, email_from):
         """
diff --git a/app/notify_client/status_api_client.py b/app/notify_client/status_api_client.py
index a37d06e86..5f8a88bad 100644
--- a/app/notify_client/status_api_client.py
+++ b/app/notify_client/status_api_client.py
@@ -8,10 +8,8 @@ class StatusApiClient(NotifyAdminAPIClient):
 
     def init_app(self, app):
         self.base_url = app.config['API_HOST_NAME']
-        self.api_key = '{}-{}'.format(
-            app.config['ADMIN_CLIENT_USER_NAME'],
-            app.config['ADMIN_CLIENT_SECRET'],
-        )
+        self.service_id = app.config['ADMIN_CLIENT_USER_NAME']
+        self.api_key = app.config['ADMIN_CLIENT_SECRET']
 
     def get_status(self, *params):
         return self.get(url='/_status', *params)
diff --git a/app/notify_client/template_statistics_api_client.py b/app/notify_client/template_statistics_api_client.py
index 0d2788d1d..589cd5067 100644
--- a/app/notify_client/template_statistics_api_client.py
+++ b/app/notify_client/template_statistics_api_client.py
@@ -7,10 +7,8 @@ class TemplateStatisticsApiClient(NotifyAdminAPIClient):
 
     def init_app(self, app):
         self.base_url = app.config['API_HOST_NAME']
-        self.api_key = '{}-{}'.format(
-            app.config['ADMIN_CLIENT_USER_NAME'],
-            app.config['ADMIN_CLIENT_SECRET'],
-        )
+        self.service_id = app.config['ADMIN_CLIENT_USER_NAME']
+        self.api_key = app.config['ADMIN_CLIENT_SECRET']
 
     def get_template_statistics_for_service(self, service_id, limit_days=None):
         params = {}
diff --git a/app/notify_client/user_api_client.py b/app/notify_client/user_api_client.py
index be14e1f61..b3904c653 100644
--- a/app/notify_client/user_api_client.py
+++ b/app/notify_client/user_api_client.py
@@ -19,10 +19,8 @@ class UserApiClient(NotifyAdminAPIClient):
 
     def init_app(self, app):
         self.base_url = app.config['API_HOST_NAME']
-        self.api_key = '{}-{}'.format(
-            app.config['ADMIN_CLIENT_USER_NAME'],
-            app.config['ADMIN_CLIENT_SECRET'],
-        )
+        self.service_id = app.config['ADMIN_CLIENT_USER_NAME']
+        self.api_key = app.config['ADMIN_CLIENT_SECRET']
         self.max_failed_login_count = app.config["MAX_FAILED_LOGIN_COUNT"]
 
     def register_user(self, name, email_address, mobile_number, password):