diff --git a/.secrets.baseline b/.secrets.baseline
index edd3e5d839..9d27348a07 100644
--- a/.secrets.baseline
+++ b/.secrets.baseline
@@ -3,7 +3,7 @@
     "files": "package-lock.json",
     "lines": null
   },
-  "generated_at": "2021-01-18T10:18:13Z",
+  "generated_at": "2021-01-18T11:24:19Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -150,21 +150,21 @@
         "hashed_secret": "d0be4e729498f4cfe8a72a28d4fceae35bd8bb27",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 14,
+        "line_number": 16,
         "type": "Secret Keyword"
       },
       {
         "hashed_secret": "2c877f34a0f47f32a5f3c77e398938b3cdc32221",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 19,
+        "line_number": 21,
         "type": "Secret Keyword"
       },
       {
         "hashed_secret": "379f1968f09d8a343338667844e01a2f433f0a3f",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 23,
+        "line_number": 25,
         "type": "Hex High Entropy String"
       }
     ],
@@ -232,14 +232,14 @@
         "hashed_secret": "0ea7458942ab65e0a340cf4fd28ca00d93c494f3",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 502,
+        "line_number": 513,
         "type": "Secret Keyword"
       },
       {
         "hashed_secret": "1695899a3d59e9fe2af1cdf242d8c451b8506173",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 546,
+        "line_number": 556,
         "type": "Secret Keyword"
       }
     ],
diff --git a/app/controllers/credentials.controller.js b/app/controllers/credentials.controller.js
index 149ee38655..d5ab40efde 100644
--- a/app/controllers/credentials.controller.js
+++ b/app/controllers/credentials.controller.js
@@ -3,10 +3,10 @@ const EDIT_NOTIFICATION_CREDENTIALS_MODE = 'editNotificationCredentials'
 
 const _ = require('lodash')
 const paths = require('../paths')
+const formatAccountPathsFor = require('../utils/format-account-paths-for')
 const { response } = require('../utils/response')
 const { renderErrorView } = require('../utils/response')
 const { ConnectorClient } = require('../services/clients/connector.client')
-const router = require('../routes')
 const { CONNECTOR_URL } = process.env
 const { CORRELATION_HEADER } = require('../utils/correlation-header')
 const { isPasswordLessThanTenChars } = require('../browsered/field-validation-checks')
@@ -109,7 +109,7 @@ module.exports = {
         gatewayAccountId: accountId
       })
 
-      return res.redirect(303, router.paths.yourPsp.index)
+      return res.redirect(303, formatAccountPathsFor(paths.account.yourPsp.index, req.account && req.account.external_id))
     } catch (err) {
       return renderErrorView(req, res)
     }
@@ -124,7 +124,7 @@ module.exports = {
         payload: credentialsPatchRequestValueOf(req), correlationId: correlationId, gatewayAccountId: accountId
       })
 
-      return res.redirect(303, router.paths.yourPsp.index)
+      return res.redirect(303, formatAccountPathsFor(paths.account.yourPsp.index, req.account && req.account.external_id))
     } catch (err) {
       return renderErrorView(req, res)
     }
diff --git a/app/controllers/your-psp/post-flex.controller.js b/app/controllers/your-psp/post-flex.controller.js
index f0a5c84b83..a2ccd713d9 100644
--- a/app/controllers/your-psp/post-flex.controller.js
+++ b/app/controllers/your-psp/post-flex.controller.js
@@ -3,6 +3,7 @@
 const lodash = require('lodash')
 
 const paths = require('../../paths')
+const formatAccountPathsFor = require('../../utils/format-account-paths-for')
 const { renderErrorView } = require('../../utils/response')
 const { ConnectorClient } = require('../../services/clients/connector.client')
 const { correlationHeader } = require('../../utils/correlation-header')
@@ -17,8 +18,9 @@ const JWT_MAC_KEY_FIELD = 'jwt-mac-key'
 
 module.exports = async (req, res) => {
   const correlationId = req.headers[correlationHeader] || ''
-
   const accountId = req.account.gateway_account_id
+  const flexUrl = formatAccountPathsFor(paths.account.yourPsp.flex, req.account && req.account.external_id)
+  const indexUrl = formatAccountPathsFor(paths.account.yourPsp.index, req.account && req.account.external_id)
 
   const orgUnitId = lodash.get(req.body, ORGANISATIONAL_UNIT_ID_FIELD, '').trim()
   const issuer = lodash.get(req.body, ISSUER_FIELD, '').trim()
@@ -32,7 +34,7 @@ module.exports = async (req, res) => {
       orgUnitId: orgUnitId,
       issuer: issuer
     })
-    return res.redirect(303, paths.yourPsp.flex)
+    return res.redirect(303, flexUrl)
   }
 
   try {
@@ -58,7 +60,7 @@ module.exports = async (req, res) => {
           orgUnitId: orgUnitId,
           issuer: issuer
         })
-        return res.redirect(303, paths.yourPsp.flex)
+        return res.redirect(303, flexUrl)
       }
     }
 
@@ -68,7 +70,7 @@ module.exports = async (req, res) => {
 
     await connector.post3dsFlexAccountCredentials(flexParams)
     req.flash('generic', 'Your Worldpay 3DS Flex settings have been updated')
-    return res.redirect(paths.yourPsp.index)
+    return res.redirect(indexUrl)
   } catch (error) {
     return renderErrorView(req, res, false, error.errorCode)
   }
diff --git a/app/controllers/your-psp/post-toggle-worldpay-3ds-flex.controller.js b/app/controllers/your-psp/post-toggle-worldpay-3ds-flex.controller.js
index c04ad73f18..68933109e9 100644
--- a/app/controllers/your-psp/post-toggle-worldpay-3ds-flex.controller.js
+++ b/app/controllers/your-psp/post-toggle-worldpay-3ds-flex.controller.js
@@ -1,6 +1,7 @@
 'use strict'
 
 const paths = require('../../paths')
+const formatAccountPathsFor = require('../../utils/format-account-paths-for')
 const { renderErrorView } = require('../../utils/response')
 const { ConnectorClient } = require('../../services/clients/connector.client')
 const connector = new ConnectorClient(process.env.CONNECTOR_URL)
@@ -8,6 +9,7 @@ const connector = new ConnectorClient(process.env.CONNECTOR_URL)
 module.exports = async function toggleWorldpay3dsFlex (req, res) {
   const accountId = req.account.gateway_account_id
   const toggleWorldpay3dsFlex = req.body['toggle-worldpay-3ds-flex']
+  const indexUrl = formatAccountPathsFor(paths.account.yourPsp.index, req.account && req.account.external_id)
 
   if (req.body['toggle-worldpay-3ds-flex'] === 'on' || req.body['toggle-worldpay-3ds-flex'] === 'off') {
     const enabling3dsFlex = toggleWorldpay3dsFlex === 'on'
@@ -16,7 +18,7 @@ module.exports = async function toggleWorldpay3dsFlex (req, res) {
     try {
       await connector.updateIntegrationVersion3ds(accountId, integrationVersion3ds, req.correlationId)
       req.flash('generic', message)
-      return res.redirect(303, paths.yourPsp.index)
+      return res.redirect(303, indexUrl)
     } catch (error) {
       return renderErrorView(req, res, false, error.errorCode)
     }
diff --git a/app/controllers/your-psp/post-toggle-worldpay-3ds-flex.controller.test.js b/app/controllers/your-psp/post-toggle-worldpay-3ds-flex.controller.test.js
index 5d0483ef11..9c0c86e62d 100644
--- a/app/controllers/your-psp/post-toggle-worldpay-3ds-flex.controller.test.js
+++ b/app/controllers/your-psp/post-toggle-worldpay-3ds-flex.controller.test.js
@@ -2,9 +2,9 @@
 
 const proxyquire = require('proxyquire')
 const sinon = require('sinon')
-const paths = require('../../paths')
 
 describe('Toggle Worldpay 3DS Flex controller', () => {
+  const gatewayAccountExternalId = 'a-gateway-account-external-id'
   let req
   let res
   let updateIntegrationVersion3dsMock
@@ -14,7 +14,8 @@ describe('Toggle Worldpay 3DS Flex controller', () => {
     req = {
       correlationId: 'correlation-id',
       account: {
-        gateway_account_id: '1'
+        gateway_account_id: '1',
+        external_id: gatewayAccountExternalId
       },
       flash: sinon.spy(),
       body: {}
@@ -36,7 +37,7 @@ describe('Toggle Worldpay 3DS Flex controller', () => {
 
     sinon.assert.calledWith(updateIntegrationVersion3dsMock, req.account.gateway_account_id, 2, req.correlationId)
     sinon.assert.calledWith(req.flash, 'generic', '3DS Flex has been turned on.')
-    sinon.assert.calledWith(res.redirect, 303, paths.yourPsp.index)
+    sinon.assert.calledWith(res.redirect, 303, `/account/${gatewayAccountExternalId}/your-psp`)
   })
 
   it('should toggle 3DS Flex off by setting 3DS integration version to 1', async () => {
@@ -48,7 +49,7 @@ describe('Toggle Worldpay 3DS Flex controller', () => {
 
     sinon.assert.calledWith(updateIntegrationVersion3dsMock, req.account.gateway_account_id, 1, req.correlationId)
     sinon.assert.calledWith(req.flash, 'generic', '3DS Flex has been turned off. Your payments will now use 3DS only.')
-    sinon.assert.calledWith(res.redirect, 303, paths.yourPsp.index)
+    sinon.assert.calledWith(res.redirect, 303, `/account/${gatewayAccountExternalId}/your-psp`)
   })
 
   it('should render an error if problem calling connector', async () => {
diff --git a/app/paths.js b/app/paths.js
index 6b624dee12..609d58e56a 100644
--- a/app/paths.js
+++ b/app/paths.js
@@ -12,6 +12,13 @@ module.exports = {
   keys,
   account: {
     root: `/account/:${keys.GATEWAY_ACCOUNT_EXTERNAL_ID}`,
+    apiKeys: {
+      index: '/api-keys',
+      revoked: '/api-keys/revoked',
+      create: '/api-keys/create',
+      revoke: '/api-keys/revoke',
+      update: '/api-keys/update'
+    },
     digitalWallet: {
       applePay: '/digital-wallet/apple-pay',
       googlePay: '/digital-wallet/google-pay'
@@ -44,12 +51,10 @@ module.exports = {
       cardNumber: '/moto-hide-card-number',
       securityCode: '/moto-hide-security-code'
     },
-    apiKeys: {
-      index: '/api-keys',
-      revoked: '/api-keys/revoked',
-      create: '/api-keys/create',
-      revoke: '/api-keys/revoke',
-      update: '/api-keys/update'
+    yourPsp: {
+      index: '/your-psp',
+      flex: '/your-psp/flex',
+      worldpay3dsFlex: '/your-psp/worldpay-3ds-flex'
     }
   },
   transactions: {
@@ -63,11 +68,6 @@ module.exports = {
     index: '/all-service-transactions',
     download: '/all-service-transactions/download'
   },
-  yourPsp: {
-    index: '/your-psp',
-    flex: '/your-psp/flex',
-    worldpay3dsFlex: '/your-psp/worldpay-3ds-flex'
-  },
   credentials: {
     index: '/credentials',
     edit: '/credentials/edit',
diff --git a/app/routes.js b/app/routes.js
index b8fcf8c4a4..8d94c52724 100644
--- a/app/routes.js
+++ b/app/routes.js
@@ -90,7 +90,7 @@ const {
   serviceSwitcher, teamMembers, staticPaths, inviteValidation, editServiceName, merchantDetails,
   notificationCredentials, prototyping, paymentLinks,
   requestToGoLive, policyPages, stripeSetup, stripe,
-  yourPsp, allServiceTransactions, payouts
+  allServiceTransactions, payouts
 } = paths
 const {
   apiKeys,
@@ -100,7 +100,8 @@ const {
   settings,
   toggle3ds,
   toggleBillingAddress,
-  toggleMotoMaskCardNumberAndSecurityCode
+  toggleMotoMaskCardNumberAndSecurityCode,
+  yourPsp
 } = paths.account
 
 // Exports
@@ -180,7 +181,6 @@ module.exports.bind = function (app) {
     ...lodash.values(allServiceTransactions),
     ...lodash.values(credentials),
     ...lodash.values(notificationCredentials),
-    ...lodash.values(apiKeys),
     ...lodash.values(editServiceName),
     ...lodash.values(serviceSwitcher),
     ...lodash.values(teamMembers),
@@ -193,7 +193,6 @@ module.exports.bind = function (app) {
     ...lodash.values(policyPages),
     ...lodash.values(stripeSetup),
     ...lodash.values(stripe),
-    ...lodash.values(yourPsp),
     ...lodash.values(payouts),
     paths.feedback
   ] // Extract all the authenticated paths as a single array
@@ -285,11 +284,6 @@ module.exports.bind = function (app) {
   account.get(settings.index, permission('transactions-details:read'), settingsController.index)
 
   // Your PSP
-  app.get(yourPsp.index, permission('gateway-credentials:read'), getAccount, paymentMethodIsCard, yourPspController.getIndex)
-  app.post(yourPsp.worldpay3dsFlex, permission('toggle-3ds:update'), getAccount, paymentMethodIsCard, yourPspController.postToggleWorldpay3dsFlex)
-  app.get(yourPsp.flex, permission('gateway-credentials:update'), getAccount, paymentMethodIsCard, yourPspController.getFlex)
-  app.post(yourPsp.flex, permission('gateway-credentials:update'), getAccount, paymentMethodIsCard, yourPspController.postFlex)
-
   account.get(yourPsp.index, permission('gateway-credentials:read'), paymentMethodIsCard, yourPspController.getIndex)
   account.post(yourPsp.worldpay3dsFlex, permission('toggle-3ds:update'), paymentMethodIsCard, yourPspController.postToggleWorldpay3dsFlex)
   account.get(yourPsp.flex, permission('gateway-credentials:update'), paymentMethodIsCard, yourPspController.getFlex)
diff --git a/app/utils/nav-builder.js b/app/utils/nav-builder.js
index deff51746d..a23528ecef 100644
--- a/app/utils/nav-builder.js
+++ b/app/utils/nav-builder.js
@@ -16,7 +16,7 @@ const mainSettingsPaths = [
 ]
 
 const yourPspPaths = [
-  paths.yourPsp,
+  paths.account.yourPsp,
   paths.credentials,
   paths.notificationCredentials
 ]
@@ -89,7 +89,7 @@ const adminNavigationItems = (currentPath, permissions, type, paymentProvider, a
     {
       id: 'navigation-menu-your-psp',
       name: `Your PSP - ${formatPSPname(paymentProvider)}`,
-      url: paths.yourPsp.index,
+      url: formatAccountPathsFor(paths.account.yourPsp.index, account.external_id),
       current: pathLookup(currentPath, yourPspPaths),
       permissions: permissions.gateway_credentials_update && type === 'card' && (paymentProvider !== 'stripe') && (paymentProvider !== 'sandbox')
     },
diff --git a/app/views/credentials/worldpay.njk b/app/views/credentials/worldpay.njk
index f1ec6a8e7e..ff7b825a29 100644
--- a/app/views/credentials/worldpay.njk
+++ b/app/views/credentials/worldpay.njk
@@ -113,7 +113,7 @@
     </form>
 
     <p class="govuk-body">
-      <a class="govuk-link govuk-link--no-visited-state" href="{{ routes.yourPsp.index }}">Cancel</a>
+      <a class="govuk-link govuk-link--no-visited-state" href="{{ formatAccountPathsFor(routes.account.yourPsp.index, currentGatewayAccount.external_id) }}">Cancel</a>
     </p>
   {% endif %}
 {% endblock %}
diff --git a/app/views/your-psp/_worldpay-flex.njk b/app/views/your-psp/_worldpay-flex.njk
index c95a312dd7..84d57a60d0 100644
--- a/app/views/your-psp/_worldpay-flex.njk
+++ b/app/views/your-psp/_worldpay-flex.njk
@@ -29,7 +29,7 @@
         actions: {
           items: [
             {
-              href: routes.yourPsp.flex + "?change=organisationalUnitId",
+              href: formatAccountPathsFor(routes.account.yourPsp.flex, currentGatewayAccount.external_id) + "?change=organisationalUnitId",
               text: "Change",
               visuallyHiddenText: "3DS Flex credentials",
               attributes: {
@@ -50,7 +50,7 @@
         actions: {
           items: [
             {
-              href: routes.yourPsp.flex + "?change=issuer",
+              href: formatAccountPathsFor(routes.account.yourPsp.flex, currentGatewayAccount.external_id) + "?change=issuer",
               text: "Change",
               visuallyHiddenText: "3DS Flex credentials"
             }
@@ -68,7 +68,7 @@
         actions: {
           items: [
             {
-              href: routes.yourPsp.flex + "?change=password",
+              href: formatAccountPathsFor(routes.account.yourPsp.flex, currentGatewayAccount.external_id) + "?change=password",
               text: "Change",
               visuallyHiddenText: "3DS Flex credentials"
             }
@@ -80,7 +80,7 @@
 }}
 
 {% if (is3dsEnabled and isWorldpay3dsFlexCredentialsConfigured) or isWorldpay3dsFlexEnabled %}
-  <form method="post" action="{{routes.yourPsp.worldpay3dsFlex}}">
+  <form method="post" action="{{ formatAccountPathsFor(routes.account.yourPsp.worldpay3dsFlex, currentGatewayAccount.external_id) }}">
     <input id="csrf" name="csrfToken" type="hidden" value="{{csrf}}">
     {% if is3dsEnabled and isWorldpay3dsFlexCredentialsConfigured and not isWorldpay3dsFlexEnabled %}
         <input id="toggle-worldpay-3ds-flex" name="toggle-worldpay-3ds-flex" type="hidden" value="on">
diff --git a/app/views/your-psp/flex.njk b/app/views/your-psp/flex.njk
index a003550d75..261a93942a 100644
--- a/app/views/your-psp/flex.njk
+++ b/app/views/your-psp/flex.njk
@@ -14,7 +14,7 @@
 {% block mainContent %}
 <div class="govuk-grid-column-two-thirds">
     <h1 class="govuk-heading-l">Your Worldpay 3DS Flex credentials</h1>
-    <form method="post" action="{{routes.yourPsp.flex}}">
+    <form method="post" action="{{ formatAccountPathsFor(routes.account.yourPsp.flex, currentGatewayAccount.external_id) }}">
       <input id="csrf" name="csrfToken" type="hidden" value="{{csrf}}" />
         {% if errors %}
           {% set errorList = [] %}
@@ -174,7 +174,7 @@
       }}
     </form>
     <p class="govuk-body">
-      <a class="govuk-link govuk-link--no-visited-state" href="{{ routes.yourPsp.index }}">Cancel</a>
+      <a class="govuk-link govuk-link--no-visited-state" href="{{ formatAccountPathsFor(routes.account.yourPsp.index, currentGatewayAccount.external_id) }}">Cancel</a>
     </p>
 </div>
 {% endblock %}
diff --git a/test/cypress/integration/settings/your-psp.cy.test.js b/test/cypress/integration/settings/your-psp.cy.test.js
index 75e4d03e93..1d0ba784c9 100644
--- a/test/cypress/integration/settings/your-psp.cy.test.js
+++ b/test/cypress/integration/settings/your-psp.cy.test.js
@@ -8,6 +8,8 @@ describe('Your PSP settings page', () => {
   const gatewayAccountId = 42
   const gatewayAccountExternalId = 'a-valid-external-id'
   const serviceName = 'Purchase a positron projection permit'
+  const yourPspPath = `/account/${gatewayAccountExternalId}/your-psp`
+  
   const testCredentials = {
     merchant_id: 'positron-permit-people',
     username: 'jonheslop',
@@ -154,7 +156,7 @@ describe('Your PSP settings page', () => {
       cy.get('#password').type(testCredentials.password)
       cy.get('#submitCredentials').click()
       cy.location().should((location) => {
-        expect(location.pathname).to.eq(`/your-psp`)
+        expect(location.pathname).to.eq(yourPspPath)
       })
     })
 
@@ -174,7 +176,7 @@ describe('Your PSP settings page', () => {
       cy.get('#jwt-mac-key').type(' ' + testFlexCredentials.jwt_mac_key + ' ')
       cy.get('#submitFlexCredentials').click()
       cy.location().should((location) => {
-        expect(location.pathname).to.eq(`/your-psp`)
+        expect(location.pathname).to.eq(yourPspPath)
       })
     })
 
@@ -202,7 +204,7 @@ describe('Your PSP settings page', () => {
       cy.get('#issuer').should('have.value', testInvalidFlexCredentials.issuer)
       cy.get('#jwt-mac-key').should('have.value', '')
       cy.location().should((location) => {
-        expect(location.pathname).to.eq(`/your-psp/flex`)
+        expect(location.pathname).to.eq(yourPspPath + '/flex')
       })
     })
 
@@ -214,7 +216,7 @@ describe('Your PSP settings page', () => {
       cy.get('h1').should('contain', 'An error occurred:')
       cy.get('#errorMsg').should('contain', 'Please try again or contact support team.')
       cy.location().should((location) => {
-        expect(location.pathname).to.eq(`/your-psp/flex`)
+        expect(location.pathname).to.eq(yourPspPath + '/flex')
       })
     })
 
@@ -229,7 +231,7 @@ describe('Your PSP settings page', () => {
       cy.get('h1').should('contain', 'An error occurred:')
       cy.get('#errorMsg').should('contain', 'Please try again or contact support team.')
       cy.location().should((location) => {
-        expect(location.pathname).to.eq(`/your-psp/flex`)
+        expect(location.pathname).to.eq(yourPspPath + '/flex')
       })
     })
   })
@@ -243,7 +245,7 @@ describe('Your PSP settings page', () => {
       })
 
       cy.setEncryptedCookies(userExternalId, gatewayAccountId)
-      cy.visit('/your-psp')
+      cy.visit(yourPspPath)
       cy.get('.value-merchant-id').should('contain', testCredentials.merchant_id)
       cy.get('.value-username').should('contain', testCredentials.username)
       cy.get('.value-password').should('contain', '●●●●●●●●')
@@ -266,14 +268,14 @@ describe('Your PSP settings page', () => {
       })
 
       cy.setEncryptedCookies(userExternalId, gatewayAccountId)
-      cy.visit('/your-psp')
+      cy.visit(yourPspPath)
       cy.get('#worldpay-3ds-flex-is-off').should('exist')
       cy.get('#worldpay-3ds-flex-is-on').should('not.exist')
       cy.get('#disable-worldpay-3ds-flex-button').should('not.exist')
 
       cy.get('#enable-worldpay-3ds-flex-button').should('exist').click()
       cy.location().should((location) => {
-        expect(location.pathname).to.eq(`/your-psp`)
+        expect(location.pathname).to.eq(yourPspPath)
       })
     })
 
@@ -287,14 +289,14 @@ describe('Your PSP settings page', () => {
       })
 
       cy.setEncryptedCookies(userExternalId, gatewayAccountId)
-      cy.visit('/your-psp')
+      cy.visit(yourPspPath)
       cy.get('#worldpay-3ds-flex-is-on').should('exist')
       cy.get('#worldpay-3ds-flex-is-off').should('not.exist')
       cy.get('#enable-worldpay-3ds-flex-button').should('not.exist')
 
       cy.get('#disable-worldpay-3ds-flex-button').should('exist').click()
       cy.location().should((location) => {
-        expect(location.pathname).to.eq(`/your-psp`)
+        expect(location.pathname).to.eq(yourPspPath)
       })
     })
 
@@ -307,7 +309,7 @@ describe('Your PSP settings page', () => {
       })
 
       cy.setEncryptedCookies(userExternalId, gatewayAccountId)
-      cy.visit('/your-psp')
+      cy.visit(yourPspPath)
       cy.get('#worldpay-3ds-flex-is-off').should('exist')
       cy.get('#worldpay-3ds-flex-is-on').should('not.exist')
       cy.get('#disable-worldpay-3ds-flex-button').should('not.exist')
@@ -324,7 +326,7 @@ describe('Your PSP settings page', () => {
       })
 
       cy.setEncryptedCookies(userExternalId, gatewayAccountId)
-      cy.visit('/your-psp')
+      cy.visit(yourPspPath)
       cy.get('#worldpay-3ds-flex-is-off').should('exist')
       cy.get('#worldpay-3ds-flex-is-on').should('not.exist')
       cy.get('#disable-worldpay-3ds-flex-button').should('not.exist')
@@ -361,7 +363,7 @@ describe('Your PSP settings page', () => {
       cy.get('#password').type(testCredentials.password)
       cy.get('#submitCredentials').click()
       cy.location().should((location) => {
-        expect(location.pathname).to.eq(`/your-psp`)
+        expect(location.pathname).to.eq(yourPspPath)
       })
     })
 
@@ -373,7 +375,7 @@ describe('Your PSP settings page', () => {
       cy.get('#notification-password').type(testCredentials.password)
       cy.get('#submitNotificationCredentials').click()
       cy.location().should((location) => {
-        expect(location.pathname).to.eq(`/your-psp`)
+        expect(location.pathname).to.eq(yourPspPath)
       })
     })
   })
@@ -389,7 +391,7 @@ describe('Your PSP settings page', () => {
 
     it('should show all credentials as configured', () => {
       cy.setEncryptedCookies(userExternalId, gatewayAccountId)
-      cy.visit('/your-psp')
+      cy.visit(yourPspPath)
       cy.get('.value-merchant-id').should('contain', testCredentials.merchant_id)
       cy.get('.value-username').should('contain', testCredentials.username)
       cy.get('.value-password').should('contain', '●●●●●●●●')
@@ -431,7 +433,7 @@ describe('Your PSP settings page', () => {
       cy.get('#shaOutPassphrase').type(testCredentials.password)
       cy.get('#submitCredentials').click()
       cy.location().should((location) => {
-        expect(location.pathname).to.eq(`/your-psp`)
+        expect(location.pathname).to.eq(yourPspPath)
       })
     })
   })
@@ -446,7 +448,7 @@ describe('Your PSP settings page', () => {
 
     it('should show all credentials as configured', () => {
       cy.setEncryptedCookies(userExternalId, gatewayAccountId)
-      cy.visit('/your-psp')
+      cy.visit(yourPspPath)
       cy.get('.value-merchant-id').should('contain', testCredentials.merchant_id)
       cy.get('.value-username').should('contain', testCredentials.username)
       cy.get('.value-password').should('contain', '●●●●●●●●')
diff --git a/test/integration/credentials.ft.test.js b/test/integration/credentials.ft.test.js
index b25fc95fd0..b24eac4afa 100644
--- a/test/integration/credentials.ft.test.js
+++ b/test/integration/credentials.ft.test.js
@@ -13,7 +13,9 @@ const mockSession = require('../test-helpers/mock-session.js')
 const gatewayAccountFixtures = require('../fixtures/gateway-account.fixtures')
 
 const ACCOUNT_ID = '182364'
+const ACCOUNT_EXTERNAL_ID = 'an-account-external-id'
 const CONNECTOR_ACCOUNT_PATH = '/v1/frontend/accounts/' + ACCOUNT_ID
+// const CONNECTOR_ACCOUNT_BY_EXTERNAL_ID_PATH = '/v1/api/accounts/external-id/' + ACCOUNT_ID
 const CONNECTOR_ACCOUNT_CREDENTIALS_PATH = CONNECTOR_ACCOUNT_PATH + '/credentials'
 const CONNECTOR_ACCOUNT_NOTIFICATION_CREDENTIALS_PATH = '/v1/api/accounts/' + ACCOUNT_ID + '/notification-credentials'
 
@@ -21,6 +23,7 @@ const requestId = 'some-unique-id'
 const defaultCorrelationHeader = {
   reqheaders: { 'x-request-id': requestId }
 }
+const yourPspPath = `/account/${ACCOUNT_EXTERNAL_ID}/your-psp`
 
 const connectorMock = nock(process.env.CONNECTOR_URL, defaultCorrelationHeader)
 
@@ -46,9 +49,9 @@ describe('Credentials endpoints', () => {
     it('should display empty credential values when no gateway credentials are set', function (done) {
       connectorMock.get(CONNECTOR_ACCOUNT_PATH)
         .reply(200, {
-          'payment_provider': 'sandbox',
-          'gateway_account_id': '1',
-          'credentials': {}
+          payment_provider: 'sandbox',
+          gateway_account_id: '1',
+          credentials: {}
         })
 
       buildGetRequest(paths.credentials.index, app)
@@ -62,15 +65,16 @@ describe('Credentials endpoints', () => {
     it('should display received credentials from connector', function (done) {
       connectorMock.get(CONNECTOR_ACCOUNT_PATH)
         .reply(200, {
-          'payment_provider': 'sandbox',
-          'gateway_account_id': '1',
-          'credentials': { 'username': 'a-username' }
+          payment_provider: 'sandbox',
+          gateway_account_id: '1',
+          external_id: ACCOUNT_EXTERNAL_ID,
+          credentials: { username: 'a-username' }
         })
 
       buildGetRequest(paths.credentials.index, app)
         .expect(200)
         .expect(response => {
-          expect(response.body.currentGatewayAccount.credentials).to.deep.equal({ 'username': 'a-username' })
+          expect(response.body.currentGatewayAccount.credentials).to.deep.equal({ username: 'a-username' })
         })
         .end(done)
     })
@@ -78,9 +82,10 @@ describe('Credentials endpoints', () => {
     it('should return the account', function (done) {
       connectorMock.get(CONNECTOR_ACCOUNT_PATH)
         .reply(200, {
-          'payment_provider': 'sandbox',
-          'gateway_account_id': '1',
-          'credentials': { username: 'a-username', merchant_id: 'a-merchant-id' }
+          payment_provider: 'sandbox',
+          gateway_account_id: '1',
+          external_id: ACCOUNT_EXTERNAL_ID,
+          credentials: { username: 'a-username', merchant_id: 'a-merchant-id' }
         })
 
       buildGetRequest(paths.credentials.index, app)
@@ -94,22 +99,22 @@ describe('Credentials endpoints', () => {
     it('should display an error if the account does not exist', function (done) {
       connectorMock.get(CONNECTOR_ACCOUNT_PATH)
         .reply(404, {
-          'message': "The gateway account id '" + ACCOUNT_ID + "' does not exist"
+          message: "The gateway account id '" + ACCOUNT_ID + "' does not exist"
         })
 
       buildGetRequest(paths.credentials.index, app)
-        .expect(500, { 'message': 'There is a problem with the payments platform' })
+        .expect(500, { message: 'There is a problem with the payments platform' })
         .end(done)
     })
 
     it('should display an error if connector returns any other error', function (done) {
       connectorMock.get(CONNECTOR_ACCOUNT_PATH)
         .reply(999, {
-          'message': 'Some error in Connector'
+          message: 'Some error in Connector'
         })
 
       buildGetRequest(paths.credentials.index, app)
-        .expect(500, { 'message': 'There is a problem with the payments platform' })
+        .expect(500, { message: 'There is a problem with the payments platform' })
         .end(done)
     })
 
@@ -117,7 +122,7 @@ describe('Credentials endpoints', () => {
       // No connectorMock defined on purpose to mock a network failure
 
       buildGetRequest(paths.credentials.index, app)
-        .expect(500, { 'message': 'There is a problem with the payments platform' })
+        .expect(500, { message: 'There is a problem with the payments platform' })
         .end(done)
     })
   })
@@ -141,9 +146,10 @@ describe('Credentials endpoints', () => {
     it('should display payment provider name', function (done) {
       connectorMock.get(CONNECTOR_ACCOUNT_PATH)
         .reply(200, {
-          'payment_provider': 'sandbox',
-          'gateway_account_id': '1',
-          'credentials': {}
+          payment_provider: 'sandbox',
+          gateway_account_id: '1',
+          external_id: ACCOUNT_EXTERNAL_ID,
+          credentials: {}
         })
 
       buildGetRequest(paths.credentials.edit, app)
@@ -157,9 +163,10 @@ describe('Credentials endpoints', () => {
     it('should display empty credential values when no gateway credentials are set', function (done) {
       connectorMock.get(CONNECTOR_ACCOUNT_PATH)
         .reply(200, {
-          'payment_provider': 'sandbox',
-          'gateway_account_id': '1',
-          'credentials': {}
+          payment_provider: 'sandbox',
+          gateway_account_id: '1',
+          external_id: ACCOUNT_EXTERNAL_ID,
+          credentials: {}
         })
 
       buildGetRequest(paths.credentials.edit, app)
@@ -173,15 +180,16 @@ describe('Credentials endpoints', () => {
     it('should display received credentials from connector', function (done) {
       connectorMock.get(CONNECTOR_ACCOUNT_PATH)
         .reply(200, {
-          'payment_provider': 'sandbox',
-          'gateway_account_id': '1',
-          'credentials': { 'username': 'a-username' }
+          payment_provider: 'sandbox',
+          gateway_account_id: '1',
+          external_id: ACCOUNT_EXTERNAL_ID,
+          credentials: { username: 'a-username' }
         })
 
       buildGetRequest(paths.credentials.edit, app)
         .expect(200)
         .expect(response => {
-          expect(response.body.currentGatewayAccount.credentials).to.deep.equal({ 'username': 'a-username' })
+          expect(response.body.currentGatewayAccount.credentials).to.deep.equal({ username: 'a-username' })
         })
         .end(done)
     })
@@ -189,9 +197,10 @@ describe('Credentials endpoints', () => {
     it('should return the account', function (done) {
       connectorMock.get(CONNECTOR_ACCOUNT_PATH)
         .reply(200, {
-          'payment_provider': 'sandbox',
-          'gateway_account_id': '1',
-          'credentials': { username: 'a-username' }
+          payment_provider: 'sandbox',
+          gateway_account_id: '1',
+          external_id: ACCOUNT_EXTERNAL_ID,
+          credentials: { username: 'a-username' }
         })
 
       buildGetRequest(paths.credentials.edit, app)
@@ -205,22 +214,22 @@ describe('Credentials endpoints', () => {
     it('should display an error if the account does not exist', function (done) {
       connectorMock.get(CONNECTOR_ACCOUNT_PATH)
         .reply(404, {
-          'message': "The gateway account id '" + ACCOUNT_ID + "' does not exist"
+          message: "The gateway account id '" + ACCOUNT_ID + "' does not exist"
         })
 
       buildGetRequest(paths.credentials.edit, app)
-        .expect(500, { 'message': 'There is a problem with the payments platform' })
+        .expect(500, { message: 'There is a problem with the payments platform' })
         .end(done)
     })
 
     it('should display an error if connector returns any other error', function (done) {
       connectorMock.get(CONNECTOR_ACCOUNT_PATH)
         .reply(999, {
-          'message': 'Some error in Connector'
+          message: 'Some error in Connector'
         })
 
       buildGetRequest(paths.credentials.edit, app)
-        .expect(500, { 'message': 'There is a problem with the payments platform' })
+        .expect(500, { message: 'There is a problem with the payments platform' })
         .end(done)
     })
 
@@ -228,7 +237,7 @@ describe('Credentials endpoints', () => {
       // No connectorMock defined on purpose to mock a network failure
 
       buildGetRequest(paths.credentials.edit, app)
-        .expect(500, { 'message': 'There is a problem with the payments platform' })
+        .expect(500, { message: 'There is a problem with the payments platform' })
         .end(done)
     })
   })
@@ -252,9 +261,10 @@ describe('Credentials endpoints', () => {
     it('should display payment provider name', function (done) {
       connectorMock.get(CONNECTOR_ACCOUNT_PATH)
         .reply(200, {
-          'payment_provider': 'sandbox',
-          'gateway_account_id': '1',
-          'credentials': {}
+          payment_provider: 'sandbox',
+          gateway_account_id: '1',
+          external_id: ACCOUNT_EXTERNAL_ID,
+          credentials: {}
         })
 
       buildGetRequest(paths.notificationCredentials.edit, app)
@@ -268,9 +278,10 @@ describe('Credentials endpoints', () => {
     it('should display empty credential values when no gateway credentials are set', function (done) {
       connectorMock.get(CONNECTOR_ACCOUNT_PATH)
         .reply(200, {
-          'payment_provider': 'sandbox',
-          'gateway_account_id': '1',
-          'credentials': {}
+          payment_provider: 'sandbox',
+          gateway_account_id: '1',
+          external_id: ACCOUNT_EXTERNAL_ID,
+          credentials: {}
         })
 
       buildGetRequest(paths.notificationCredentials.edit, app)
@@ -284,15 +295,16 @@ describe('Credentials endpoints', () => {
     it('should display received credentials from connector', function (done) {
       connectorMock.get(CONNECTOR_ACCOUNT_PATH)
         .reply(200, {
-          'payment_provider': 'sandbox',
-          'gateway_account_id': '1',
-          'credentials': { 'username': 'a-username' }
+          payment_provider: 'sandbox',
+          gateway_account_id: '1',
+          external_id: ACCOUNT_EXTERNAL_ID,
+          credentials: { username: 'a-username' }
         })
 
       buildGetRequest(paths.notificationCredentials.edit, app)
         .expect(200)
         .expect(response => {
-          expect(response.body.currentGatewayAccount.credentials).to.be.deep.equal({ 'username': 'a-username' })
+          expect(response.body.currentGatewayAccount.credentials).to.be.deep.equal({ username: 'a-username' })
         })
         .end(done)
     })
@@ -300,9 +312,9 @@ describe('Credentials endpoints', () => {
     it('should return the account', function (done) {
       connectorMock.get(CONNECTOR_ACCOUNT_PATH)
         .reply(200, {
-          'payment_provider': 'sandbox',
-          'gateway_account_id': '1',
-          'credentials': { username: 'a-username', merchant_id: 'a-merchant-id' }
+          payment_provider: 'sandbox',
+          gateway_account_id: '1',
+          credentials: { username: 'a-username', merchant_id: 'a-merchant-id' }
         })
 
       buildGetRequest(paths.notificationCredentials.edit, app)
@@ -316,22 +328,22 @@ describe('Credentials endpoints', () => {
     it('should display an error if the account does not exist', function (done) {
       connectorMock.get(CONNECTOR_ACCOUNT_PATH)
         .reply(404, {
-          'message': "The gateway account id '" + ACCOUNT_ID + "' does not exist"
+          message: "The gateway account id '" + ACCOUNT_ID + "' does not exist"
         })
 
       buildGetRequest(paths.notificationCredentials.edit, app)
-        .expect(500, { 'message': 'There is a problem with the payments platform' })
+        .expect(500, { message: 'There is a problem with the payments platform' })
         .end(done)
     })
 
     it('should display an error if connector returns any other error', function (done) {
       connectorMock.get(CONNECTOR_ACCOUNT_PATH)
         .reply(999, {
-          'message': 'Some error in Connector'
+          message: 'Some error in Connector'
         })
 
       buildGetRequest(paths.notificationCredentials.edit, app)
-        .expect(500, { 'message': 'There is a problem with the payments platform' })
+        .expect(500, { message: 'There is a problem with the payments platform' })
         .end(done)
     })
 
@@ -339,7 +351,7 @@ describe('Credentials endpoints', () => {
       // No connectorMock defined on purpose to mock a network failure
 
       buildGetRequest(paths.notificationCredentials.edit, app)
-        .expect(500, { 'message': 'There is a problem with the payments platform' })
+        .expect(500, { message: 'There is a problem with the payments platform' })
         .end(done)
     })
   })
@@ -363,13 +375,14 @@ describe('Credentials endpoints', () => {
     it('should pass through the notification credentials', function (done) {
       connectorMock.get(CONNECTOR_ACCOUNT_PATH)
         .reply(200, {
-          'payment_provider': 'smartpay',
-          'gateway_account_id': '1',
-          'credentials': {
-            'username': 'a-username',
-            'merchant_id': 'a-merchant-id'
+          payment_provider: 'smartpay',
+          gateway_account_id: '1',
+          external_id: ACCOUNT_EXTERNAL_ID,
+          credentials: {
+            username: 'a-username',
+            merchant_id: 'a-merchant-id'
           },
-          'notification_credentials': { username: 'a-notification-username' }
+          notification_credentials: { username: 'a-notification-username' }
         })
 
       buildGetRequest(paths.notificationCredentials.index, app)
@@ -398,84 +411,82 @@ describe('Credentials endpoints', () => {
       connectorMock.get(CONNECTOR_ACCOUNT_PATH)
         .reply(200,
           gatewayAccountFixtures.validGatewayAccountResponse({
-            gateway_account_id: ACCOUNT_ID
+            gateway_account_id: ACCOUNT_ID,
+            external_id: ACCOUNT_EXTERNAL_ID
           }))
     })
 
     it('should send new username, password and merchant_id credentials to connector', function (done) {
       connectorMock.patch(CONNECTOR_ACCOUNT_CREDENTIALS_PATH, {
-        'credentials': {
-          'username': 'a-username',
-          'password': 'a-password',
-          'merchant_id': 'a-merchant-id'
+        credentials: {
+          username: 'a-username',
+          password: 'a-password',
+          merchant_id: 'a-merchant-id'
         }
       }).reply(200, {})
 
-      const sendData = { 'username': 'a-username', 'password': 'a-password', 'merchantId': 'a-merchant-id' }
-      const expectedLocation = paths.yourPsp.index
+      const sendData = { username: 'a-username', password: 'a-password', merchantId: 'a-merchant-id' }
       const path = paths.credentials.index
       buildFormPostRequest(path, sendData, true, app)
         .expect(303, {})
-        .expect('Location', expectedLocation)
+        .expect('Location', yourPspPath)
         .end(done)
     })
 
     it('should send new username, password, merchant_id, sha_in_passphrase and sha_out_passphrase credentials to connector', function (done) {
       connectorMock.patch(CONNECTOR_ACCOUNT_CREDENTIALS_PATH, {
-        'credentials': {
-          'username': 'a-username',
-          'password': 'a-password',
-          'merchant_id': 'a-psp-id',
-          'sha_in_passphrase': 'a-sha-in-passphrase',
-          'sha_out_passphrase': 'a-sha-out-passphrase'
+        credentials: {
+          username: 'a-username',
+          password: 'a-password',
+          merchant_id: 'a-psp-id',
+          sha_in_passphrase: 'a-sha-in-passphrase',
+          sha_out_passphrase: 'a-sha-out-passphrase'
 
         }
       }).reply(200, {})
 
       const sendData = {
-        'username': 'a-username',
-        'password': 'a-password',
-        'merchantId': 'a-psp-id',
-        'shaInPassphrase': 'a-sha-in-passphrase',
-        'shaOutPassphrase': 'a-sha-out-passphrase'
+        username: 'a-username',
+        password: 'a-password',
+        merchantId: 'a-psp-id',
+        shaInPassphrase: 'a-sha-in-passphrase',
+        shaOutPassphrase: 'a-sha-out-passphrase'
       }
-      const expectedLocation = paths.yourPsp.index
       const path = paths.credentials.index
       buildFormPostRequest(path, sendData, true, app)
         .expect(303, {})
-        .expect('Location', expectedLocation)
+        .expect('Location', yourPspPath)
         .end(done)
     })
 
     it('should send any arbitrary credentials together with username and password to connector', function (done) {
       connectorMock.patch(CONNECTOR_ACCOUNT_CREDENTIALS_PATH, {
-        'credentials': {
-          'username': 'a-username',
-          'password': 'a-password'
+        credentials: {
+          username: 'a-username',
+          password: 'a-password'
         }
       })
         .reply(200, {})
 
-      const sendData = { 'username': 'a-username', 'password': 'a-password' }
-      const expectedLocation = paths.yourPsp.index
+      const sendData = { username: 'a-username', password: 'a-password' }
       const path = paths.credentials.index
       buildFormPostRequest(path, sendData, true, app)
         .expect(303, {})
-        .expect('Location', expectedLocation)
+        .expect('Location', yourPspPath)
         .end(done)
     })
 
     it('should display an error if connector returns failure', function (done) {
       connectorMock.patch(CONNECTOR_ACCOUNT_PATH, {
-        'username': 'a-username',
-        'password': 'a-password'
+        username: 'a-username',
+        password: 'a-password'
       })
         .reply(999, {
-          'message': 'Error message'
+          message: 'Error message'
         })
 
-      const sendData = { 'username': 'a-username', 'password': 'a-password' }
-      const expectedData = { 'message': 'There is a problem with the payments platform' }
+      const sendData = { username: 'a-username', password: 'a-password' }
+      const expectedData = { message: 'There is a problem with the payments platform' }
       const path = paths.credentials.index
       buildFormPostRequest(path, sendData, true, app)
         .expect(500, expectedData)
@@ -485,8 +496,8 @@ describe('Credentials endpoints', () => {
     it('should display an error if the connection to connector fails', function (done) {
       // No connectorMock defined on purpose to mock a network failure
 
-      const sendData = { 'username': 'a-username', 'password': 'a-password' }
-      const expectedData = { 'message': 'There is a problem with the payments platform' }
+      const sendData = { username: 'a-username', password: 'a-password' }
+      const expectedData = { message: 'There is a problem with the payments platform' }
       const path = paths.credentials.index
       buildFormPostRequest(path, sendData, true, app)
         .expect(500, expectedData)
@@ -495,11 +506,11 @@ describe('Credentials endpoints', () => {
 
     it('should fail if there is no csrf', done => {
       connectorMock.patch(CONNECTOR_ACCOUNT_CREDENTIALS_PATH, {
-        'username': 'a-username',
-        'password': 'a-password'
+        username: 'a-username',
+        password: 'a-password'
       }).reply(200, {})
 
-      const sendData = { 'username': 'a-username', 'password': 'a-password' }
+      const sendData = { username: 'a-username', password: 'a-password' }
       const path = paths.credentials.index
       buildFormPostRequest(path, sendData, false, app)
         .expect(400, { message: 'There is a problem with the payments platform' })
@@ -528,22 +539,21 @@ describe('Credentials endpoints', () => {
 
     it('should send new username and password notification credentials to connector', function (done) {
       connectorMock.post(CONNECTOR_ACCOUNT_NOTIFICATION_CREDENTIALS_PATH, {
-        'username': 'a-notification-username',
-        'password': 'a-notification-password'
+        username: 'a-notification-username',
+        password: 'a-notification-password'
       })
         .reply(200, {})
 
-      const sendData = { 'username': 'a-notification-username', 'password': 'a-notification-password' }
-      const expectedLocation = paths.yourPsp.index
+      const sendData = { username: 'a-notification-username', password: 'a-notification-password' }
       const path = paths.notificationCredentials.update
       buildFormPostRequest(path, sendData, true, app)
         .expect(303, {})
-        .expect('Location', expectedLocation)
+        .expect('Location', yourPspPath)
         .end(done)
     })
 
     it('should should flash a relevant error if no password is sent', function (done) {
-      const sendData = { 'password': 'a-notification-password' }
+      const sendData = { password: 'a-notification-password' }
       const path = paths.notificationCredentials.update
       buildFormPostRequest(path, sendData, true, app)
         .expect(res => {
@@ -555,7 +565,7 @@ describe('Credentials endpoints', () => {
         .end(done)
     })
     it('should should flash a relevant error if no password is sent', function (done) {
-      const sendData = { 'username': 'a-notification-username' }
+      const sendData = { username: 'a-notification-username' }
       const path = paths.notificationCredentials.update
       buildFormPostRequest(path, sendData, true, app)
         .expect(res => {
@@ -568,7 +578,7 @@ describe('Credentials endpoints', () => {
     })
 
     it('should should flash a relevant error if too short a password is sent', function (done) {
-      const sendData = { 'username': 'a-notification-username', 'password': '123456789' }
+      const sendData = { username: 'a-notification-username', password: '123456789' }
       const path = paths.notificationCredentials.update
       buildFormPostRequest(path, sendData, true, app)
         .expect(res => {
@@ -586,7 +596,8 @@ function mockConnectorGetAccount () {
   connectorMock.get(CONNECTOR_ACCOUNT_PATH)
     .reply(200,
       gatewayAccountFixtures.validGatewayAccountResponse({
-        gateway_account_id: ACCOUNT_ID
+        gateway_account_id: ACCOUNT_ID,
+        external_id: ACCOUNT_EXTERNAL_ID
       }))
 }