From f9f2f1ae497eb42327af6fa1ab04b95afe8a8e22 Mon Sep 17 00:00:00 2001
From: Stuart Laverick <appsol@users.noreply.github.com>
Date: Tue, 6 Jul 2021 17:42:44 +0100
Subject: [PATCH 1/5] Updated response to create submit based on role (#33)

---
 src/views/services/Create.vue | 280 ++++++++++++++++++----------------
 1 file changed, 151 insertions(+), 129 deletions(-)

diff --git a/src/views/services/Create.vue b/src/views/services/Create.vue
index 33c7fcd5..3fe74ba6 100644
--- a/src/views/services/Create.vue
+++ b/src/views/services/Create.vue
@@ -35,142 +35,157 @@
                 >
               </li>
             </gov-list>
-          </template>
 
-          <gov-heading size="m">Add service</gov-heading>
+            <div v-if="updateRequestCreated">
+              <gov-heading size="m" tag="h3"
+                >Create service request</gov-heading
+              >
+              <gov-body>{{ updateRequestMessage }}</gov-body>
+              <gov-back-link :to="{ name: 'services-index' }"
+                >Back to services</gov-back-link
+              >
+            </div>
+          </template>
 
-          <gov-error-summary v-if="form.$errors.any()" title="Check for errors">
-            <gov-list>
-              <li
-                v-for="(error, field) in form.$errors.all()"
-                :key="field"
-                v-text="error[0]"
-              />
-            </gov-list>
-          </gov-error-summary>
+          <template v-if="!updateRequestCreated">
+            <gov-heading size="m">Add service</gov-heading>
 
-          <gov-tabs @tab-changed="onTabChange" :tabs="allowedTabs" no-router>
-            <details-tab
-              v-show="isTabActive('details')"
-              @clear="
-                form.$errors.clear($event);
-                errors = {};
-              "
-              :errors="form.$errors"
-              :is-new="true"
-              :name.sync="form.name"
-              :slug.sync="form.slug"
-              :type.sync="form.type"
-              :organisation_id.sync="form.organisation_id"
-              :url.sync="form.url"
-              @update:logo_file_id="form.logo_file_id = $event"
-              :status.sync="form.status"
-              :gallery_items.sync="form.gallery_items"
+            <gov-error-summary
+              v-if="form.$errors.any()"
+              title="Check for errors"
             >
-              <gov-button @click="onNext" start>Next</gov-button>
-            </details-tab>
+              <gov-list>
+                <li
+                  v-for="(error, field) in form.$errors.all()"
+                  :key="field"
+                  v-text="error[0]"
+                />
+              </gov-list>
+            </gov-error-summary>
 
-            <additional-info-tab
-              v-if="isTabActive('additional-info')"
-              @clear="
-                form.$errors.clear($event);
-                errors = {};
-              "
-              :errors="form.$errors"
-              :type="form.type"
-              :wait_time.sync="form.wait_time"
-              :is_free.sync="form.is_free"
-              :fees_text.sync="form.fees_text"
-              :fees_url.sync="form.fees_url"
-              :testimonial.sync="form.testimonial"
-              :video_embed.sync="form.video_embed"
-              :contact_name.sync="form.contact_name"
-              :contact_phone.sync="form.contact_phone"
-              :contact_email.sync="form.contact_email"
-            >
-              <gov-button @click="onNext" start>Next</gov-button>
-            </additional-info-tab>
+            <gov-tabs @tab-changed="onTabChange" :tabs="allowedTabs" no-router>
+              <details-tab
+                v-show="isTabActive('details')"
+                @clear="
+                  form.$errors.clear($event);
+                  errors = {};
+                "
+                :errors="form.$errors"
+                :is-new="true"
+                :name.sync="form.name"
+                :slug.sync="form.slug"
+                :type.sync="form.type"
+                :organisation_id.sync="form.organisation_id"
+                :url.sync="form.url"
+                @update:logo_file_id="form.logo_file_id = $event"
+                :status.sync="form.status"
+                :gallery_items.sync="form.gallery_items"
+              >
+                <gov-button @click="onNext" start>Next</gov-button>
+              </details-tab>
 
-            <useful-info-tab
-              v-if="isTabActive('useful-info')"
-              @clear="
-                form.$errors.clear($event);
-                errors = {};
-              "
-              :errors="form.$errors"
-              :type="form.type"
-              :useful_infos.sync="form.useful_infos"
-            >
-              <gov-button @click="onNext" start>Next</gov-button>
-            </useful-info-tab>
+              <additional-info-tab
+                v-if="isTabActive('additional-info')"
+                @clear="
+                  form.$errors.clear($event);
+                  errors = {};
+                "
+                :errors="form.$errors"
+                :type="form.type"
+                :wait_time.sync="form.wait_time"
+                :is_free.sync="form.is_free"
+                :fees_text.sync="form.fees_text"
+                :fees_url.sync="form.fees_url"
+                :testimonial.sync="form.testimonial"
+                :video_embed.sync="form.video_embed"
+                :contact_name.sync="form.contact_name"
+                :contact_phone.sync="form.contact_phone"
+                :contact_email.sync="form.contact_email"
+              >
+                <gov-button @click="onNext" start>Next</gov-button>
+              </additional-info-tab>
 
-            <eligibility-tab
-              v-if="isTabActive('eligibility')"
-              @clear="
-                form.$errors.clear($event);
-                errors = {};
-              "
-              :errors="form.$errors"
-              :type="form.type"
-              :serviceEligibilityTypes.sync="form.eligibility_types"
-            >
-              <gov-button @click="onNext" start>Next</gov-button>
-            </eligibility-tab>
+              <useful-info-tab
+                v-if="isTabActive('useful-info')"
+                @clear="
+                  form.$errors.clear($event);
+                  errors = {};
+                "
+                :errors="form.$errors"
+                :type="form.type"
+                :useful_infos.sync="form.useful_infos"
+              >
+                <gov-button @click="onNext" start>Next</gov-button>
+              </useful-info-tab>
 
-            <taxonomies-tab
-              v-if="isTabActive('taxonomies')"
-              @clear="
-                form.$errors.clear($event);
-                errors = {};
-              "
-              :errors="form.$errors"
-              :is-global-admin="auth.isGlobalAdmin"
-              :type="form.type"
-              :category_taxonomies.sync="form.category_taxonomies"
-            >
-              <gov-button @click="onNext" start>Next</gov-button>
-            </taxonomies-tab>
+              <eligibility-tab
+                v-if="isTabActive('eligibility')"
+                @clear="
+                  form.$errors.clear($event);
+                  errors = {};
+                "
+                :errors="form.$errors"
+                :type="form.type"
+                :serviceEligibilityTypes.sync="form.eligibility_types"
+              >
+                <gov-button @click="onNext" start>Next</gov-button>
+              </eligibility-tab>
 
-            <description-tab
-              v-if="isTabActive('description')"
-              @clear="
-                form.$errors.clear($event);
-                errors = {};
-              "
-              :errors="form.$errors"
-              :type="form.type"
-              :intro.sync="form.intro"
-              :offerings.sync="form.offerings"
-              :description.sync="form.description"
-            >
-              <gov-button @click="onNext" start>Next</gov-button>
-            </description-tab>
+              <taxonomies-tab
+                v-if="isTabActive('taxonomies')"
+                @clear="
+                  form.$errors.clear($event);
+                  errors = {};
+                "
+                :errors="form.$errors"
+                :is-global-admin="auth.isGlobalAdmin"
+                :type="form.type"
+                :category_taxonomies.sync="form.category_taxonomies"
+              >
+                <gov-button @click="onNext" start>Next</gov-button>
+              </taxonomies-tab>
 
-            <referral-tab
-              v-if="isTabActive('referral')"
-              @clear="
-                form.$errors.clear($event);
-                errors = {};
-              "
-              :errors="form.$errors"
-              :is-global-admin="auth.isGlobalAdmin"
-              :is-super-admin="auth.isSuperAdmin"
-              :type="form.type"
-              :show_referral_disclaimer.sync="form.show_referral_disclaimer"
-              :referral_method.sync="form.referral_method"
-              :referral_button_text.sync="form.referral_button_text"
-              :referral_email.sync="form.referral_email"
-              :referral_url.sync="form.referral_url"
-            >
-              <gov-button v-if="form.$submitting" disabled type="submit"
-                >Creating...</gov-button
+              <description-tab
+                v-if="isTabActive('description')"
+                @clear="
+                  form.$errors.clear($event);
+                  errors = {};
+                "
+                :errors="form.$errors"
+                :type="form.type"
+                :intro.sync="form.intro"
+                :offerings.sync="form.offerings"
+                :description.sync="form.description"
               >
-              <gov-button v-else @click="onSubmit" type="submit"
-                >Create</gov-button
+                <gov-button @click="onNext" start>Next</gov-button>
+              </description-tab>
+
+              <referral-tab
+                v-if="isTabActive('referral')"
+                @clear="
+                  form.$errors.clear($event);
+                  errors = {};
+                "
+                :errors="form.$errors"
+                :is-global-admin="auth.isGlobalAdmin"
+                :is-super-admin="auth.isSuperAdmin"
+                :type="form.type"
+                :show_referral_disclaimer.sync="form.show_referral_disclaimer"
+                :referral_method.sync="form.referral_method"
+                :referral_button_text.sync="form.referral_button_text"
+                :referral_email.sync="form.referral_email"
+                :referral_url.sync="form.referral_url"
               >
-              <ck-submit-error v-if="form.$errors.any()" />
-            </referral-tab>
-          </gov-tabs>
+                <gov-button v-if="form.$submitting" disabled type="submit"
+                  >Creating...</gov-button
+                >
+                <gov-button v-else @click="onSubmit" type="submit"
+                  >Create</gov-button
+                >
+                <ck-submit-error v-if="form.$errors.any()" />
+              </referral-tab>
+            </gov-tabs>
+          </template>
         </gov-grid-column>
       </gov-grid-row>
     </gov-main-wrapper>
@@ -259,7 +274,9 @@ export default {
         { id: "taxonomies", heading: "Taxonomies", active: false },
         { id: "description", heading: "Description", active: false },
         { id: "referral", heading: "Referral", active: false }
-      ]
+      ],
+      updateRequestCreated: false,
+      updateRequestMessage: null
     };
   },
   computed: {
@@ -294,10 +311,15 @@ export default {
       // Refetch the user as new permissions added for the new service.
       await this.auth.fetchUser();
 
-      this.$router.push({
-        name: "services-post-create",
-        params: { service: serviceId }
-      });
+      if (this.auth.isGlobalAdmin && serviceId) {
+        this.$router.push({
+          name: "services-post-create",
+          params: { service: serviceId }
+        });
+      } else if (!this.form.$errors.any()) {
+        this.updateRequestCreated = true;
+        this.updateRequestMessage = data.message;
+      }
     },
     onTabChange({ index }) {
       this.tabs.forEach(tab => (tab.active = false));

From 08b07ecfb25d514a3e906cecc58c8c1aa696f8a6 Mon Sep 17 00:00:00 2001
From: Stuart Laverick <appsol@users.noreply.github.com>
Date: Thu, 8 Jul 2021 15:58:32 +0100
Subject: [PATCH 2/5] ServiceDetails handles lack of origin object better (#34)

---
 .../update-requests/show/ServiceDetails.vue   | 88 +++++++++----------
 1 file changed, 42 insertions(+), 46 deletions(-)

diff --git a/src/views/update-requests/show/ServiceDetails.vue b/src/views/update-requests/show/ServiceDetails.vue
index 29ef153d..2e735cae 100644
--- a/src/views/update-requests/show/ServiceDetails.vue
+++ b/src/views/update-requests/show/ServiceDetails.vue
@@ -111,7 +111,10 @@
             <div
               v-for="rootTaxonomy in eligibilityTypes"
               :key="rootTaxonomy.id"
-              v-if="eligibilityChanged(rootTaxonomy)"
+              v-if="
+                eligibilityTaxonomyChanged(rootTaxonomy) ||
+                  eligibilityCustomChanged(rootTaxonomy)
+              "
             >
               <span class="govuk-!-font-weight-bold">{{
                 rootTaxonomy.name
@@ -119,21 +122,12 @@
               <ck-taxonomy-tree
                 v-if="Array.isArray(service.eligibility_types.taxonomies)"
                 :taxonomies="rootTaxonomy.children"
-                :checked="original.eligibility_types.taxonomies"
+                :checked="original ? original.eligibility_types.taxonomies : []"
                 :error="false"
                 :filteredTaxonomyIds="updatedServiceEligibilities"
                 :disabled="true"
               />
-              <gov-body
-                v-if="
-                  original.eligibility_types.hasOwnProperty('custom') &&
-                    original.eligibility_types.custom[
-                      slugify(rootTaxonomy.name)
-                    ] !==
-                      service.eligibility_types.custom[
-                        slugify(rootTaxonomy.name)
-                      ]
-                "
+              <gov-body v-if="eligibilityCustomChanged(rootTaxonomy)"
                 >Custom Value:
                 {{
                   original.eligibility_types.custom[slugify(rootTaxonomy.name)]
@@ -145,7 +139,10 @@
             <div
               v-for="rootTaxonomy in eligibilityTypes"
               :key="rootTaxonomy.id"
-              v-if="eligibilityChanged(rootTaxonomy)"
+              v-if="
+                eligibilityTaxonomyChanged(rootTaxonomy) ||
+                  eligibilityCustomChanged(rootTaxonomy)
+              "
             >
               <span class="govuk-!-font-weight-bold">{{
                 rootTaxonomy.name
@@ -158,16 +155,7 @@
                 :filteredTaxonomyIds="updatedServiceEligibilities"
                 :disabled="true"
               />
-              <gov-body
-                v-if="
-                  service.eligibility_types.hasOwnProperty('custom') &&
-                    original.eligibility_types.custom[
-                      slugify(rootTaxonomy.name)
-                    ] !==
-                      service.eligibility_types.custom[
-                        slugify(rootTaxonomy.name)
-                      ]
-                "
+              <gov-body v-if="eligibilityCustomChanged(rootTaxonomy)"
                 >Custom Value:
                 {{
                   service.eligibility_types.custom[slugify(rootTaxonomy.name)]
@@ -544,20 +532,22 @@ export default {
 
   computed: {
     updatedServiceEligibilities() {
-      const originalTaxonomies = this.original.eligibility_types.taxonomies.reduce(
-        (taxonomyIds, taxonomyId) => {
-          const taxonomy = this.flattenedEligibilityTypes.find(
-            taxonomy => taxonomy.id === taxonomyId
-          );
-          return taxonomyIds.concat(
-            this.getTaxonomyAndAncestorsIds(
-              taxonomy,
-              this.flattenedEligibilityTypes
-            )
-          );
-        },
-        []
-      );
+      const originalTaxonomies = this.original
+        ? this.original.eligibility_types.taxonomies.reduce(
+            (taxonomyIds, taxonomyId) => {
+              const taxonomy = this.flattenedEligibilityTypes.find(
+                taxonomy => taxonomy.id === taxonomyId
+              );
+              return taxonomyIds.concat(
+                this.getTaxonomyAndAncestorsIds(
+                  taxonomy,
+                  this.flattenedEligibilityTypes
+                )
+              );
+            },
+            []
+          )
+        : [];
       const updatedTaxonomies = this.service.eligibility_types.taxonomies.reduce(
         (taxonomyIds, taxonomyId) => {
           const taxonomy = this.flattenedEligibilityTypes.find(
@@ -682,17 +672,23 @@ export default {
       return name.toLowerCase().replaceAll(" ", "_");
     },
 
-    eligibilityChanged(eligibilityRoot) {
+    eligibilityTaxonomyChanged(eligibilityRoot) {
       return (
         this.service.hasOwnProperty("eligibility_types") &&
-        (this.updatedServiceEligibilities.includes(eligibilityRoot.id) ||
-          (this.service.eligibility_types.hasOwnProperty("custom") &&
-            this.original.eligibility_types.custom[
-              this.slugify(eligibilityRoot.name)
-            ] !==
-              this.service.eligibility_types.custom[
-                this.slugify(eligibilityRoot.name)
-              ]))
+        this.updatedServiceEligibilities.includes(eligibilityRoot.id)
+      );
+    },
+    eligibilityCustomChanged(eligibilityRoot) {
+      const rootSlug = this.slugify(eligibilityRoot.name);
+
+      const customEligibility = this.original
+        ? this.original.eligibility_types.custom[rootSlug]
+        : "";
+
+      return (
+        this.service.eligibility_types.hasOwnProperty("custom") &&
+        typeof this.service.eligibility_types.custom[rootSlug] == "string" &&
+        this.service.eligibility_types.custom[rootSlug] !== customEligibility
       );
     }
   },

From e35a16c58a98fabaef424614a93b293a6d4edc38 Mon Sep 17 00:00:00 2001
From: Stuart Laverick <appsol@users.noreply.github.com>
Date: Fri, 9 Jul 2021 16:26:06 +0100
Subject: [PATCH 3/5] Added help page with menu and links (#35)

---
 src/App.vue                               |  4 +
 src/router.js                             |  6 ++
 src/views/Dashboard.vue                   |  2 +
 src/views/help/Index.vue                  | 97 +++++++++++++++++++++++
 src/views/help/components/VideoIframe.vue | 68 ++++++++++++++++
 5 files changed, 177 insertions(+)
 create mode 100644 src/views/help/Index.vue
 create mode 100644 src/views/help/components/VideoIframe.vue

diff --git a/src/App.vue b/src/App.vue
index ab1cebbf..79de2ec9 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -77,6 +77,10 @@ export default {
           text: "Update requests",
           to: { name: "update-requests-index" },
           hide: !Auth.isGlobalAdmin
+        },
+        {
+          text: "Help",
+          to: { name: "help-index" }
         }
       ];
     },
diff --git a/src/router.js b/src/router.js
index 6f299a6d..fdd53897 100644
--- a/src/router.js
+++ b/src/router.js
@@ -25,6 +25,12 @@ let router = new Router({
       component: () => import("@/views/Dashboard"),
       meta: { auth: true }
     },
+    {
+      path: "/help",
+      name: "help-index",
+      component: () => import("@/views/help/Index"),
+      meta: { auth: true }
+    },
     {
       path: "/organisations",
       name: "organisations-index",
diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue
index fb7848da..378fda11 100644
--- a/src/views/Dashboard.vue
+++ b/src/views/Dashboard.vue
@@ -16,6 +16,8 @@
             <gov-link href="mailto:onehounslowconnect@hounslow.gov.uk">
               onehounslowconnect@hounslow.gov.uk
             </gov-link>
+            or view our
+            <gov-link :to="{ name: 'help-index' }">help videos</gov-link>
           </gov-body>
         </gov-grid-column>
       </gov-grid-row>
diff --git a/src/views/help/Index.vue b/src/views/help/Index.vue
new file mode 100644
index 00000000..641f50c5
--- /dev/null
+++ b/src/views/help/Index.vue
@@ -0,0 +1,97 @@
+<template>
+  <gov-width-container>
+    <vue-headful title="One Hounslow Connect - Help" />
+
+    <gov-back-link :to="{ name: 'dashboard' }">Back to dashboard</gov-back-link>
+
+    <gov-main-wrapper>
+      <gov-grid-row>
+        <gov-grid-column width="full">
+          <gov-heading size="xl">Help</gov-heading>
+          <gov-body
+            >Welcome to the help section. Please follow the links below to our
+            series of "how to" guides on YouTube.</gov-body
+          >
+          <template v-for="(videoPair, i) in pairedVideos">
+            <gov-grid-row :key="`video-pair-${i}`">
+              <gov-grid-column
+                v-for="(video, j) in videoPair"
+                :key="`video-${j}`"
+                width="one-half"
+              >
+                <video-iframe
+                  :height="video.height"
+                  :width="video.width"
+                  :src="video.src"
+                  :title="video.title"
+                />
+                <gov-heading size="m">{{ video.title }}</gov-heading>
+              </gov-grid-column>
+            </gov-grid-row>
+          </template>
+        </gov-grid-column>
+      </gov-grid-row>
+    </gov-main-wrapper>
+  </gov-width-container>
+</template>
+
+<script>
+import VideoIframe from "./components/VideoIframe";
+
+export default {
+  name: "Help",
+
+  components: {
+    VideoIframe
+  },
+
+  data() {
+    return {
+      videos: [
+        {
+          height: 315,
+          width: 560,
+          src: "https://www.youtube.com/embed/HALo2I-gdXs",
+          title: "Introduction the to video training series"
+        },
+        {
+          height: 315,
+          width: 560,
+          src: "https://www.youtube.com/embed/RoeMDBZLJQc",
+          title: "How to sign up to the platform"
+        },
+        {
+          height: 315,
+          width: 560,
+          src: "https://www.youtube.com/embed/p3-4mlY1pOQ",
+          title: "Your first login, managing your organisation and adding users"
+        },
+        {
+          height: 315,
+          width: 560,
+          src: "https://www.youtube.com/embed/Qf421buT6zs",
+          title: "Adding your service"
+        }
+      ]
+    };
+  },
+
+  computed: {
+    pairedVideos() {
+      let pairedVideos = [];
+      this.videos.forEach((video, index) => {
+        if (index % 2 == 0) {
+          let videoPair = [video];
+          if (typeof this.videos[index + 1] !== "undefined") {
+            videoPair.push(this.videos[index + 1]);
+          }
+          pairedVideos.push(videoPair);
+        }
+      });
+      return pairedVideos;
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/help/components/VideoIframe.vue b/src/views/help/components/VideoIframe.vue
new file mode 100644
index 00000000..f2ccc177
--- /dev/null
+++ b/src/views/help/components/VideoIframe.vue
@@ -0,0 +1,68 @@
+<template>
+  <iframe
+    :width="computedWidth"
+    :height="computedHeight"
+    :src="src"
+    :title="title"
+    frameborder="0"
+    allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+    allowfullscreen
+  ></iframe>
+</template>
+
+<script>
+export default {
+  props: {
+    width: {
+      type: Number,
+      required: true
+    },
+    height: {
+      type: Number,
+      required: true
+    },
+    src: {
+      type: String,
+      required: true
+    },
+    title: {
+      type: String,
+      required: true
+    }
+  },
+
+  data() {
+    return {
+      computedWidth: 0,
+      computedHeight: 0
+    };
+  },
+
+  computed: {
+    aspectRatio() {
+      return this.height / this.width;
+    }
+  },
+  methods: {
+    computeWidth() {
+      const style = getComputedStyle(this.$parent.$el);
+      const leftPad = parseInt(style.paddingLeft) || 0;
+      const rightPad = parseInt(style.paddingRight) || 0;
+      this.computedWidth = this.$parent.$el.clientWidth - leftPad - rightPad;
+    },
+    computeHeight() {
+      const style = getComputedStyle(this.$parent.$el);
+      const topPad = parseInt(style.paddingTop) || 0;
+      const bottomPad = parseInt(style.paddingBottom) || 0;
+      this.computedHeight =
+        this.computedWidth * this.aspectRatio - topPad - bottomPad;
+    }
+  },
+  mounted() {
+    this.computeWidth();
+    this.computeHeight();
+  }
+};
+</script>
+
+<style lang="scss" scoped></style>

From 27ed8c5f51e210436f58c71e7a4e8572427bcc6b Mon Sep 17 00:00:00 2001
From: Stuart Laverick <appsol@users.noreply.github.com>
Date: Fri, 9 Jul 2021 17:10:32 +0100
Subject: [PATCH 4/5] Convert all visible instances of One Hounslow Connect to
 Hounslow Connect (#36)

---
 src/App.vue                                     |  4 ++--
 src/views/Dashboard.vue                         | 17 +++++++----------
 src/views/admin/Index.vue                       |  2 +-
 src/views/admin/index/AuditLogs.vue             |  2 +-
 src/views/admin/index/Cms.vue                   |  2 +-
 src/views/admin/index/Collections.vue           |  2 +-
 src/views/admin/index/Feedback.vue              |  2 +-
 src/views/admin/index/Notifications.vue         |  2 +-
 src/views/admin/index/SearchEngine.vue          |  2 +-
 src/views/admin/index/Taxonomies.vue            |  2 +-
 src/views/admin/index/cms/Updated.vue           |  2 +-
 src/views/audits/Show.vue                       |  5 +----
 src/views/auth/Login.vue                        |  4 ++--
 src/views/auth/Logout.vue                       |  2 +-
 src/views/collections/categories/Create.vue     |  2 +-
 src/views/collections/categories/Edit.vue       |  2 +-
 src/views/collections/personas/Create.vue       |  2 +-
 src/views/collections/personas/Edit.vue         |  2 +-
 src/views/errors/404.vue                        |  2 +-
 src/views/help/Index.vue                        |  2 +-
 src/views/locations/Create.vue                  |  2 +-
 src/views/locations/Edit.vue                    |  4 +---
 src/views/locations/Index.vue                   |  2 +-
 src/views/locations/Show.vue                    |  2 +-
 src/views/locations/Updated.vue                 |  2 +-
 src/views/notifications/Show.vue                |  2 +-
 src/views/organisations/Create.vue              |  2 +-
 src/views/organisations/Edit.vue                |  4 +---
 src/views/organisations/Import.vue              |  2 +-
 src/views/organisations/Index.vue               |  2 +-
 src/views/organisations/Show.vue                |  2 +-
 src/views/organisations/Updated.vue             |  4 +---
 src/views/page-feedbacks/Show.vue               |  2 +-
 src/views/referrals/Confirmation.vue            |  2 +-
 src/views/referrals/Index.vue                   |  2 +-
 src/views/referrals/Show.vue                    |  4 +---
 src/views/register/Completed.vue                |  2 +-
 src/views/register/Search.vue                   |  4 ++--
 .../register/components/InformationCopy.vue     |  2 +-
 src/views/register/forms/AdditionalInfoTab.vue  |  4 ++--
 src/views/register/forms/DescriptionTab.vue     |  2 +-
 src/views/register/forms/DetailsTab.vue         |  2 +-
 src/views/register/new/Criteria.vue             |  5 ++---
 src/views/register/new/Register.vue             |  2 +-
 src/views/reports/Edit.vue                      |  4 ++--
 src/views/reports/Index.vue                     |  2 +-
 src/views/service-locations/Create.vue          |  4 +---
 src/views/service-locations/Edit.vue            |  2 +-
 src/views/service-locations/Show.vue            |  3 +--
 src/views/service-locations/Updated.vue         |  2 +-
 src/views/services/Create.vue                   |  2 +-
 src/views/services/Edit.vue                     |  2 +-
 src/views/services/Import.vue                   |  2 +-
 src/views/services/Index.vue                    |  2 +-
 src/views/services/PostCreate.vue               |  2 +-
 src/views/services/PreCreate.vue                |  2 +-
 src/views/services/Refresh.vue                  |  2 +-
 src/views/services/Show.vue                     |  4 +---
 src/views/services/Updated.vue                  |  2 +-
 src/views/services/forms/AdditionalInfoTab.vue  |  2 +-
 src/views/services/forms/DescriptionTab.vue     |  2 +-
 src/views/services/forms/DetailsTab.vue         |  2 +-
 src/views/services/forms/ReferralTab.vue        |  8 ++++----
 src/views/stop-words/Edit.vue                   |  2 +-
 src/views/taxonomies/categories/Create.vue      |  2 +-
 src/views/taxonomies/categories/Edit.vue        |  4 +---
 src/views/taxonomies/organisations/Create.vue   |  2 +-
 src/views/taxonomies/organisations/Edit.vue     |  2 +-
 .../taxonomies/service-eligibilities/Create.vue |  2 +-
 .../taxonomies/service-eligibilities/Edit.vue   |  2 +-
 src/views/thesaurus/Edit.vue                    |  2 +-
 src/views/update-requests/Index.vue             |  2 +-
 src/views/update-requests/Show.vue              |  2 +-
 src/views/users/Create.vue                      |  2 +-
 src/views/users/Edit.vue                        |  4 ++--
 src/views/users/Index.vue                       |  2 +-
 src/views/users/Show.vue                        |  2 +-
 77 files changed, 93 insertions(+), 115 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 79de2ec9..50ec3d92 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,14 +1,14 @@
 <template>
   <div id="app">
     <vue-headful
-      title="One Hounslow Connect"
+      title="Hounslow Connect"
       :head="headAttributes"
       :html="htmlAttributes"
     />
 
     <gov-skip-link href="#main-content">Skip to main content</gov-skip-link>
 
-    <gov-header service-name="One Hounslow Connect" :navigation="headerNav" />
+    <gov-header service-name="Hounslow Connect" :navigation="headerNav" />
 
     <div class="govuk-width-container">
       <main
diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue
index 378fda11..fd6fcff4 100644
--- a/src/views/Dashboard.vue
+++ b/src/views/Dashboard.vue
@@ -1,18 +1,17 @@
 <template>
   <gov-width-container>
-    <vue-headful title="One Hounslow Connect - Dashboard" />
+    <vue-headful title="Hounslow Connect - Dashboard" />
 
     <gov-main-wrapper>
       <gov-grid-row>
         <gov-grid-column width="two-thirds">
           <gov-heading size="xl">
-            Welcome to the One Hounslow Connect admin portal
+            Welcome to the Hounslow Connect admin portal
           </gov-heading>
 
           <gov-body size="l">
-            From here, you can add and edit your pages on One Hounslow Connect,
-            as well as manage referrals into your service. For any support,
-            contact
+            From here, you can add and edit your pages on Hounslow Connect, as
+            well as manage referrals into your service. For any support, contact
             <gov-link href="mailto:onehounslowconnect@hounslow.gov.uk">
               onehounslowconnect@hounslow.gov.uk
             </gov-link>
@@ -27,7 +26,7 @@
       <gov-grid-row>
         <gov-grid-column width="one-half">
           <gov-heading size="l">Services</gov-heading>
-          <gov-body>Add or edit your pages on One Hounslow Connect.</gov-body>
+          <gov-body>Add or edit your pages on Hounslow Connect.</gov-body>
           <gov-button start :to="{ name: 'services-index' }">
             Go to services
           </gov-button>
@@ -54,9 +53,7 @@
 
         <gov-grid-column width="one-half" v-if="auth.isGlobalAdmin">
           <gov-heading size="l">Organisations</gov-heading>
-          <gov-body
-            >Add or edit organisations on One Hounslow Connect.</gov-body
-          >
+          <gov-body>Add or edit organisations on Hounslow Connect.</gov-body>
           <gov-button start :to="{ name: 'organisations-index' }">
             Go to organisations
           </gov-button>
@@ -75,7 +72,7 @@
         <gov-grid-column width="one-half" v-if="auth.isGlobalAdmin">
           <gov-heading size="l">Reports</gov-heading>
           <gov-body>
-            Download reports of activity on One Hounslow Connect.
+            Download reports of activity on Hounslow Connect.
           </gov-body>
           <gov-button start :to="{ name: 'reports-index' }">
             Go to reports
diff --git a/src/views/admin/Index.vue b/src/views/admin/Index.vue
index e72584d6..0f5a2cb6 100644
--- a/src/views/admin/Index.vue
+++ b/src/views/admin/Index.vue
@@ -1,6 +1,6 @@
 <template>
   <gov-width-container>
-    <vue-headful title="One Hounslow Connect - Admin" />
+    <vue-headful title="Hounslow Connect - Admin" />
 
     <gov-back-link :to="{ name: 'dashboard' }">Back to dashboard</gov-back-link>
 
diff --git a/src/views/admin/index/AuditLogs.vue b/src/views/admin/index/AuditLogs.vue
index 43fb55d4..4b724ee3 100644
--- a/src/views/admin/index/AuditLogs.vue
+++ b/src/views/admin/index/AuditLogs.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <vue-headful title="One Hounslow Connect - Admin: Audits" />
+    <vue-headful title="Hounslow Connect - Admin: Audits" />
 
     <gov-heading size="l">Audit logs</gov-heading>
 
diff --git a/src/views/admin/index/Cms.vue b/src/views/admin/index/Cms.vue
index a524374b..bea3e12b 100644
--- a/src/views/admin/index/Cms.vue
+++ b/src/views/admin/index/Cms.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <vue-headful title="One Hounslow Connect - Admin: CMS" />
+    <vue-headful title="Hounslow Connect - Admin: CMS" />
 
     <gov-heading size="l">Frontend</gov-heading>
 
diff --git a/src/views/admin/index/Collections.vue b/src/views/admin/index/Collections.vue
index efda4ae1..09285b53 100644
--- a/src/views/admin/index/Collections.vue
+++ b/src/views/admin/index/Collections.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <vue-headful title="One Hounslow Connect - Admin: Collections" />
+    <vue-headful title="Hounslow Connect - Admin: Collections" />
 
     <gov-tabs :tabs="tabs">
       <router-view />
diff --git a/src/views/admin/index/Feedback.vue b/src/views/admin/index/Feedback.vue
index a6ec0157..862af37c 100644
--- a/src/views/admin/index/Feedback.vue
+++ b/src/views/admin/index/Feedback.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <vue-headful title="One Hounslow Connect - Admin: Page Feedback" />
+    <vue-headful title="Hounslow Connect - Admin: Page Feedback" />
 
     <gov-heading size="l">Feedback</gov-heading>
 
diff --git a/src/views/admin/index/Notifications.vue b/src/views/admin/index/Notifications.vue
index f2f16f40..f83b1290 100644
--- a/src/views/admin/index/Notifications.vue
+++ b/src/views/admin/index/Notifications.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <vue-headful title="One Hounslow Connect - Admin: Notifications" />
+    <vue-headful title="Hounslow Connect - Admin: Notifications" />
 
     <gov-heading size="l">Notifications</gov-heading>
     <ck-loader v-if="loading" />
diff --git a/src/views/admin/index/SearchEngine.vue b/src/views/admin/index/SearchEngine.vue
index b47d24e9..3f16b28e 100644
--- a/src/views/admin/index/SearchEngine.vue
+++ b/src/views/admin/index/SearchEngine.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <vue-headful title="One Hounslow Connect - Admin: Search Engine" />
+    <vue-headful title="Hounslow Connect - Admin: Search Engine" />
 
     <gov-tabs :tabs="tabs">
       <router-view />
diff --git a/src/views/admin/index/Taxonomies.vue b/src/views/admin/index/Taxonomies.vue
index 75c7a141..dcbabaf9 100644
--- a/src/views/admin/index/Taxonomies.vue
+++ b/src/views/admin/index/Taxonomies.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <vue-headful title="One Hounslow Connect - Admin: Taxonomies" />
+    <vue-headful title="Hounslow Connect - Admin: Taxonomies" />
 
     <gov-tabs :tabs="tabs">
       <router-view />
diff --git a/src/views/admin/index/cms/Updated.vue b/src/views/admin/index/cms/Updated.vue
index 05b91cab..81bd7a73 100644
--- a/src/views/admin/index/cms/Updated.vue
+++ b/src/views/admin/index/cms/Updated.vue
@@ -1,6 +1,6 @@
 <template>
   <gov-width-container>
-    <vue-headful :title="`One Hounslow Connect - Admin: CMS Updated`" />
+    <vue-headful :title="`Hounslow Connect - Admin: CMS Updated`" />
 
     <gov-main-wrapper>
       <gov-grid-row>
diff --git a/src/views/audits/Show.vue b/src/views/audits/Show.vue
index bea903db..fcf07841 100644
--- a/src/views/audits/Show.vue
+++ b/src/views/audits/Show.vue
@@ -6,10 +6,7 @@
       <gov-grid-row v-else>
         <vue-headful
           :title="
-            `One Hounslow Connect - Audit: ${audit.description.substr(
-              0,
-              10
-            )}...`
+            `Hounslow Connect - Audit: ${audit.description.substr(0, 10)}...`
           "
         />
 
diff --git a/src/views/auth/Login.vue b/src/views/auth/Login.vue
index 6d4d4498..7f43a97b 100644
--- a/src/views/auth/Login.vue
+++ b/src/views/auth/Login.vue
@@ -1,6 +1,6 @@
 <template>
   <gov-width-container>
-    <vue-headful title="One Hounslow Connect - Login" />
+    <vue-headful title="Hounslow Connect - Login" />
 
     <gov-back-link :to="{ name: 'dashboard' }">Back to dashboard</gov-back-link>
     <gov-main-wrapper>
@@ -10,7 +10,7 @@
 
           <template v-if="!validateRequest">
             <gov-body size="l">
-              Click below to login to the One Hounslow Connect admin portal:
+              Click below to login to the Hounslow Connect admin portal:
             </gov-body>
 
             <gov-button :href="loginUrl">Login</gov-button>
diff --git a/src/views/auth/Logout.vue b/src/views/auth/Logout.vue
index d9e8ddd8..09a723c8 100644
--- a/src/views/auth/Logout.vue
+++ b/src/views/auth/Logout.vue
@@ -1,6 +1,6 @@
 <template>
   <gov-width-container>
-    <vue-headful title="One Hounslow Connect - Logout" />
+    <vue-headful title="Hounslow Connect - Logout" />
 
     <gov-main-wrapper>
       <gov-grid-row>
diff --git a/src/views/collections/categories/Create.vue b/src/views/collections/categories/Create.vue
index b8ab06e4..83446b0f 100644
--- a/src/views/collections/categories/Create.vue
+++ b/src/views/collections/categories/Create.vue
@@ -1,6 +1,6 @@
 <template>
   <gov-width-container>
-    <vue-headful title="One Hounslow Connect - Add Collection Category" />
+    <vue-headful title="Hounslow Connect - Add Collection Category" />
 
     <gov-back-link :to="{ name: 'admin-index-collections' }"
       >Back to collection categories</gov-back-link
diff --git a/src/views/collections/categories/Edit.vue b/src/views/collections/categories/Edit.vue
index ffab9a62..587e7263 100644
--- a/src/views/collections/categories/Edit.vue
+++ b/src/views/collections/categories/Edit.vue
@@ -4,7 +4,7 @@
     <template v-else>
       <vue-headful
         :title="
-          `One Hounslow Connect - Edit Collection Category: ${collection.name}`
+          `Hounslow Connect - Edit Collection Category: ${collection.name}`
         "
       />
 
diff --git a/src/views/collections/personas/Create.vue b/src/views/collections/personas/Create.vue
index 0f47ab64..31e34f0b 100644
--- a/src/views/collections/personas/Create.vue
+++ b/src/views/collections/personas/Create.vue
@@ -1,6 +1,6 @@
 <template>
   <gov-width-container>
-    <vue-headful title="One Hounslow Connect - Add Collection Persona" />
+    <vue-headful title="Hounslow Connect - Add Collection Persona" />
 
     <gov-back-link :to="{ name: 'admin-index-collections-personas' }"
       >Back to collection personas</gov-back-link
diff --git a/src/views/collections/personas/Edit.vue b/src/views/collections/personas/Edit.vue
index c14576c7..67fb7e3a 100644
--- a/src/views/collections/personas/Edit.vue
+++ b/src/views/collections/personas/Edit.vue
@@ -4,7 +4,7 @@
     <template v-else>
       <vue-headful
         :title="
-          `One Hounslow Connect - Edit Collection Persona: ${collection.name}`
+          `Hounslow Connect - Edit Collection Persona: ${collection.name}`
         "
       />
 
diff --git a/src/views/errors/404.vue b/src/views/errors/404.vue
index eb271066..a24ee51d 100644
--- a/src/views/errors/404.vue
+++ b/src/views/errors/404.vue
@@ -1,6 +1,6 @@
 <template>
   <gov-width-container>
-    <vue-headful title="One Hounslow Connect - Page Not Found" />
+    <vue-headful title="Hounslow Connect - Page Not Found" />
 
     <gov-main-wrapper>
       <gov-grid-row>
diff --git a/src/views/help/Index.vue b/src/views/help/Index.vue
index 641f50c5..f32efbfc 100644
--- a/src/views/help/Index.vue
+++ b/src/views/help/Index.vue
@@ -1,6 +1,6 @@
 <template>
   <gov-width-container>
-    <vue-headful title="One Hounslow Connect - Help" />
+    <vue-headful title="Hounslow Connect - Help" />
 
     <gov-back-link :to="{ name: 'dashboard' }">Back to dashboard</gov-back-link>
 
diff --git a/src/views/locations/Create.vue b/src/views/locations/Create.vue
index 292425f8..3aa40a30 100644
--- a/src/views/locations/Create.vue
+++ b/src/views/locations/Create.vue
@@ -1,6 +1,6 @@
 <template>
   <gov-width-container>
-    <vue-headful title="One Hounslow Connect - Add Location" />
+    <vue-headful title="Hounslow Connect - Add Location" />
 
     <gov-back-link :to="{ name: 'locations-index' }"
       >Back to locations</gov-back-link
diff --git a/src/views/locations/Edit.vue b/src/views/locations/Edit.vue
index a34302c5..b75907e4 100644
--- a/src/views/locations/Edit.vue
+++ b/src/views/locations/Edit.vue
@@ -3,9 +3,7 @@
     <ck-loader v-if="loading" />
     <template v-else>
       <vue-headful
-        :title="
-          `One Hounslow Connect - Edit Location: ${location.address_line_1}`
-        "
+        :title="`Hounslow Connect - Edit Location: ${location.address_line_1}`"
       />
 
       <gov-back-link
diff --git a/src/views/locations/Index.vue b/src/views/locations/Index.vue
index 80f2736c..8adef4d5 100644
--- a/src/views/locations/Index.vue
+++ b/src/views/locations/Index.vue
@@ -1,6 +1,6 @@
 <template>
   <gov-width-container>
-    <vue-headful title="One Hounslow Connect - List Locations" />
+    <vue-headful title="Hounslow Connect - List Locations" />
 
     <gov-back-link :to="{ name: 'dashboard' }">Back to dashboard</gov-back-link>
 
diff --git a/src/views/locations/Show.vue b/src/views/locations/Show.vue
index bd6ae77f..3fe3c570 100644
--- a/src/views/locations/Show.vue
+++ b/src/views/locations/Show.vue
@@ -7,7 +7,7 @@
       <ck-loader v-if="loading" />
       <gov-grid-row v-else>
         <vue-headful
-          :title="`One Hounslow Connect - Location: ${location.address_line_1}`"
+          :title="`Hounslow Connect - Location: ${location.address_line_1}`"
         />
 
         <gov-grid-column width="two-thirds">
diff --git a/src/views/locations/Updated.vue b/src/views/locations/Updated.vue
index ffc254cd..202b2af2 100644
--- a/src/views/locations/Updated.vue
+++ b/src/views/locations/Updated.vue
@@ -4,7 +4,7 @@
     <template v-else>
       <vue-headful
         :title="
-          `One Hounslow Connect - Location Updated: ${location.address_line_1}`
+          `Hounslow Connect - Location Updated: ${location.address_line_1}`
         "
       />
 
diff --git a/src/views/notifications/Show.vue b/src/views/notifications/Show.vue
index 4bec2cb1..1161852e 100644
--- a/src/views/notifications/Show.vue
+++ b/src/views/notifications/Show.vue
@@ -8,7 +8,7 @@
       <gov-grid-row v-else>
         <vue-headful
           :title="
-            `One Hounslow Connect - Notification: ${notification.message.substr(
+            `Hounslow Connect - Notification: ${notification.message.substr(
               0,
               10
             )}...`
diff --git a/src/views/organisations/Create.vue b/src/views/organisations/Create.vue
index ec5c8f5f..69775fd4 100644
--- a/src/views/organisations/Create.vue
+++ b/src/views/organisations/Create.vue
@@ -1,6 +1,6 @@
 <template>
   <gov-width-container>
-    <vue-headful title="One Hounslow Connect - Add Organisation" />
+    <vue-headful title="Hounslow Connect - Add Organisation" />
 
     <gov-back-link :to="{ name: 'organisations-index' }"
       >Back to organisations</gov-back-link
diff --git a/src/views/organisations/Edit.vue b/src/views/organisations/Edit.vue
index 0bdcc8aa..a4a46be8 100644
--- a/src/views/organisations/Edit.vue
+++ b/src/views/organisations/Edit.vue
@@ -3,9 +3,7 @@
     <ck-loader v-if="loading" />
     <template v-else>
       <vue-headful
-        :title="
-          `One Hounslow Connect - Edit Organisation: ${organisation.name}`
-        "
+        :title="`Hounslow Connect - Edit Organisation: ${organisation.name}`"
       />
 
       <gov-back-link
diff --git a/src/views/organisations/Import.vue b/src/views/organisations/Import.vue
index e63e8b91..5a0340f4 100644
--- a/src/views/organisations/Import.vue
+++ b/src/views/organisations/Import.vue
@@ -1,6 +1,6 @@
 <template>
   <gov-width-container>
-    <vue-headful title="One Hounslow Connect - Import Organisations" />
+    <vue-headful title="Hounslow Connect - Import Organisations" />
 
     <gov-back-link :to="{ name: 'organisations-index' }"
       >Back to Organisations</gov-back-link
diff --git a/src/views/organisations/Index.vue b/src/views/organisations/Index.vue
index 6d9c36ba..4e382e74 100644
--- a/src/views/organisations/Index.vue
+++ b/src/views/organisations/Index.vue
@@ -1,6 +1,6 @@
 <template>
   <gov-width-container>
-    <vue-headful title="One Hounslow Connect - List Organisations" />
+    <vue-headful title="Hounslow Connect - List Organisations" />
 
     <gov-back-link :to="{ name: 'dashboard' }">Back to dashboard</gov-back-link>
     <gov-main-wrapper>
diff --git a/src/views/organisations/Show.vue b/src/views/organisations/Show.vue
index a9b63b63..ace1396f 100644
--- a/src/views/organisations/Show.vue
+++ b/src/views/organisations/Show.vue
@@ -7,7 +7,7 @@
       <ck-loader v-if="loading" />
       <gov-grid-row v-else>
         <vue-headful
-          :title="`One Hounslow Connect - Organisation: ${organisation.name}`"
+          :title="`Hounslow Connect - Organisation: ${organisation.name}`"
         />
 
         <gov-grid-column width="two-thirds">
diff --git a/src/views/organisations/Updated.vue b/src/views/organisations/Updated.vue
index 93b88e59..1cf9dda2 100644
--- a/src/views/organisations/Updated.vue
+++ b/src/views/organisations/Updated.vue
@@ -3,9 +3,7 @@
     <ck-loader v-if="loading" />
     <template v-else>
       <vue-headful
-        :title="
-          `One Hounslow Connect - Organisation Updated: ${organisation.name}`
-        "
+        :title="`Hounslow Connect - Organisation Updated: ${organisation.name}`"
       />
 
       <gov-back-link
diff --git a/src/views/page-feedbacks/Show.vue b/src/views/page-feedbacks/Show.vue
index 529bec46..7ee6450a 100644
--- a/src/views/page-feedbacks/Show.vue
+++ b/src/views/page-feedbacks/Show.vue
@@ -8,7 +8,7 @@
       <gov-grid-row v-else>
         <vue-headful
           :title="
-            `One Hounslow Connect - Page Feedback: ${pageFeedback.feedback.substr(
+            `Hounslow Connect - Page Feedback: ${pageFeedback.feedback.substr(
               0,
               10
             )}...`
diff --git a/src/views/referrals/Confirmation.vue b/src/views/referrals/Confirmation.vue
index 0d913ad4..69e7bcab 100644
--- a/src/views/referrals/Confirmation.vue
+++ b/src/views/referrals/Confirmation.vue
@@ -1,6 +1,6 @@
 <template>
   <gov-width-container>
-    <vue-headful title="One Hounslow Connect - View Referral" />
+    <vue-headful title="Hounslow Connect - View Referral" />
 
     <gov-back-link :to="{ name: 'referrals-index' }"
       >Back to referrals</gov-back-link
diff --git a/src/views/referrals/Index.vue b/src/views/referrals/Index.vue
index 772f256e..015d3327 100644
--- a/src/views/referrals/Index.vue
+++ b/src/views/referrals/Index.vue
@@ -1,6 +1,6 @@
 <template>
   <gov-width-container>
-    <vue-headful title="One Hounslow Connect - List Referrals" />
+    <vue-headful title="Hounslow Connect - List Referrals" />
 
     <gov-back-link :to="{ name: 'dashboard' }">Back to dashboard</gov-back-link>
     <gov-main-wrapper>
diff --git a/src/views/referrals/Show.vue b/src/views/referrals/Show.vue
index 69ca0a31..d560b8a4 100644
--- a/src/views/referrals/Show.vue
+++ b/src/views/referrals/Show.vue
@@ -6,9 +6,7 @@
     <gov-main-wrapper>
       <ck-loader v-if="loadingReferral" />
       <template v-else>
-        <vue-headful
-          :title="`One Hounslow Connect - Referral: ${referral.name}`"
-        />
+        <vue-headful :title="`Hounslow Connect - Referral: ${referral.name}`" />
 
         <gov-grid-row>
           <gov-grid-column width="two-thirds">
diff --git a/src/views/register/Completed.vue b/src/views/register/Completed.vue
index 08485e4e..66fae0e3 100644
--- a/src/views/register/Completed.vue
+++ b/src/views/register/Completed.vue
@@ -5,7 +5,7 @@
     </gov-heading>
 
     <gov-body>
-      Thank you for registering on One Hounslow Connect.
+      Thank you for registering on Hounslow Connect.
     </gov-body>
 
     <gov-body>
diff --git a/src/views/register/Search.vue b/src/views/register/Search.vue
index 4a17f182..beab93ce 100644
--- a/src/views/register/Search.vue
+++ b/src/views/register/Search.vue
@@ -13,8 +13,8 @@
     </gov-heading>
 
     <gov-body>
-      Before you register an account on One Hounslow Connect, we need to check
-      if your organisation is already registered in our database.
+      Before you register an account on Hounslow Connect, we need to check if
+      your organisation is already registered in our database.
     </gov-body>
     <gov-body
       >Type the name of your organisation below to check if it is already
diff --git a/src/views/register/components/InformationCopy.vue b/src/views/register/components/InformationCopy.vue
index 72361fb5..9c26b6de 100644
--- a/src/views/register/components/InformationCopy.vue
+++ b/src/views/register/components/InformationCopy.vue
@@ -4,7 +4,7 @@
       Important information
     </gov-heading>
     <gov-body>
-      Once your organisation is listed on One Hounslow Connect, it is really
+      Once your organisation is listed on Hounslow Connect, it is really
       important that you keep your organisation and service information
       up-to-date. For example:
     </gov-body>
diff --git a/src/views/register/forms/AdditionalInfoTab.vue b/src/views/register/forms/AdditionalInfoTab.vue
index 16c1a383..a0d59cce 100644
--- a/src/views/register/forms/AdditionalInfoTab.vue
+++ b/src/views/register/forms/AdditionalInfoTab.vue
@@ -142,7 +142,7 @@
         <gov-body>
           Please provide your {{ service.type }}’s public-facing contact
           details. These will be displayed on your {{ service.type }}’s page on
-          the One Hounslow Connect website.
+          the Hounslow Connect website.
         </gov-body>
 
         <gov-section-break size="l" />
@@ -264,7 +264,7 @@ export default {
     videoEmbedHelpHref() {
       const to = "onehounslowconnect@hounslow.gov.uk";
       const subject = `Make a video for my ${this.service.type}`;
-      const body = `My ${this.service.type} is: xxx\n\nI am interested in making a video for my ${this.service.type} page on One Hounslow Connect.`;
+      const body = `My ${this.service.type} is: xxx\n\nI am interested in making a video for my ${this.service.type} page on Hounslow Connect.`;
 
       return `mailto:${to}?subject=${encodeURIComponent(
         subject
diff --git a/src/views/register/forms/DescriptionTab.vue b/src/views/register/forms/DescriptionTab.vue
index 5775d594..794f50a4 100644
--- a/src/views/register/forms/DescriptionTab.vue
+++ b/src/views/register/forms/DescriptionTab.vue
@@ -5,7 +5,7 @@
       <gov-grid-column width="one-half">
         <gov-body>
           These sections should describe what your {{ service.type }} offers and
-          is the main body of content on your page on One Hounslow Connect.
+          is the main body of content on your page on Hounslow Connect.
         </gov-body>
 
         <gov-section-break size="l" />
diff --git a/src/views/register/forms/DetailsTab.vue b/src/views/register/forms/DetailsTab.vue
index 4b03f906..9a80f1f5 100644
--- a/src/views/register/forms/DetailsTab.vue
+++ b/src/views/register/forms/DetailsTab.vue
@@ -16,7 +16,7 @@
           @input="$emit('input', { field: 'type', value: $event })"
           id="type"
           label="What is it?"
-          hint="This option changes how your page is described on One Hounslow Connect"
+          hint="This option changes how your page is described on Hounslow Connect"
           :options="typeOptions"
           :error="errors.get('service.type')"
         />
diff --git a/src/views/register/new/Criteria.vue b/src/views/register/new/Criteria.vue
index c9960b84..3d9f4d62 100644
--- a/src/views/register/new/Criteria.vue
+++ b/src/views/register/new/Criteria.vue
@@ -9,7 +9,7 @@
     </gov-back-link>
 
     <gov-heading size="l">
-      Is your organisation right for One Hounslow Connect?
+      Is your organisation right for Hounslow Connect?
     </gov-heading>
 
     <gov-body>
@@ -19,8 +19,7 @@
     <gov-form-group>
       <gov-label>
         <strong>
-          The organisation that you want to be listed on One Hounslow Connect
-          is:
+          The organisation that you want to be listed on Hounslow Connect is:
         </strong>
       </gov-label>
 
diff --git a/src/views/register/new/Register.vue b/src/views/register/new/Register.vue
index 3a71f54d..f9bcffe8 100644
--- a/src/views/register/new/Register.vue
+++ b/src/views/register/new/Register.vue
@@ -1,6 +1,6 @@
 <template>
   <gov-width-container>
-    <vue-headful title="One Hounslow Connect - Register" />
+    <vue-headful title="Hounslow Connect - Register" />
 
     <gov-error-summary v-if="form.$errors.any()" title="Check for errors">
       <gov-list>
diff --git a/src/views/reports/Edit.vue b/src/views/reports/Edit.vue
index 2c05a730..f6c28876 100644
--- a/src/views/reports/Edit.vue
+++ b/src/views/reports/Edit.vue
@@ -116,7 +116,7 @@ export default {
           type: "Locations Export",
           description:
             "Generate a report with all the locations of services on " +
-            "One Hounslow Connect, and the number of services delivered at each.",
+            "Hounslow Connect, and the number of services delivered at each.",
           scheduleForm: new Form({
             report_type: "Locations Export",
             repeat_type: null
@@ -130,7 +130,7 @@ export default {
         {
           type: "Organisations Export",
           description:
-            "Generate a report of all the organisations on One Hounslow Connect " +
+            "Generate a report of all the organisations on Hounslow Connect " +
             "with the number of services and attributed accounts.",
           scheduleForm: new Form({
             report_type: "Organisations Export",
diff --git a/src/views/reports/Index.vue b/src/views/reports/Index.vue
index 5470f64d..3fae8615 100644
--- a/src/views/reports/Index.vue
+++ b/src/views/reports/Index.vue
@@ -1,6 +1,6 @@
 <template>
   <gov-width-container>
-    <vue-headful title="One Hounslow Connect - Reports" />
+    <vue-headful title="Hounslow Connect - Reports" />
 
     <gov-back-link :to="{ name: 'dashboard' }">Back to dashboard</gov-back-link>
     <gov-main-wrapper>
diff --git a/src/views/service-locations/Create.vue b/src/views/service-locations/Create.vue
index 1106cda7..927f2da1 100644
--- a/src/views/service-locations/Create.vue
+++ b/src/views/service-locations/Create.vue
@@ -3,9 +3,7 @@
     <ck-loader v-if="loading" />
     <template v-else>
       <vue-headful
-        :title="
-          `One Hounslow Connect - Add Service Location for: ${service.name}`
-        "
+        :title="`Hounslow Connect - Add Service Location for: ${service.name}`"
       />
 
       <gov-back-link
diff --git a/src/views/service-locations/Edit.vue b/src/views/service-locations/Edit.vue
index 6334ca55..f13c598c 100644
--- a/src/views/service-locations/Edit.vue
+++ b/src/views/service-locations/Edit.vue
@@ -4,7 +4,7 @@
     <template v-else>
       <vue-headful
         :title="
-          `One Hounslow Connect - Edit Service Location: ${serviceLocation.name ||
+          `Hounslow Connect - Edit Service Location: ${serviceLocation.name ||
             '-'}`
         "
       />
diff --git a/src/views/service-locations/Show.vue b/src/views/service-locations/Show.vue
index 91e42c91..0da38d74 100644
--- a/src/views/service-locations/Show.vue
+++ b/src/views/service-locations/Show.vue
@@ -4,8 +4,7 @@
     <template v-else>
       <vue-headful
         :title="
-          `One Hounslow Connect - Service Location: ${serviceLocation.name ||
-            '-'}`
+          `Hounslow Connect - Service Location: ${serviceLocation.name || '-'}`
         "
       />
 
diff --git a/src/views/service-locations/Updated.vue b/src/views/service-locations/Updated.vue
index 58e7f1fc..d5e956e6 100644
--- a/src/views/service-locations/Updated.vue
+++ b/src/views/service-locations/Updated.vue
@@ -4,7 +4,7 @@
     <template v-else>
       <vue-headful
         :title="
-          `One Hounslow Connect - Service Location Updated: ${serviceLocation.name}`
+          `Hounslow Connect - Service Location Updated: ${serviceLocation.name}`
         "
       />
 
diff --git a/src/views/services/Create.vue b/src/views/services/Create.vue
index 3fe74ba6..ee3d50a7 100644
--- a/src/views/services/Create.vue
+++ b/src/views/services/Create.vue
@@ -1,6 +1,6 @@
 <template>
   <gov-width-container>
-    <vue-headful title="One Hounslow Connect - Add Service" />
+    <vue-headful title="Hounslow Connect - Add Service" />
 
     <gov-back-link :to="{ name: 'services-index' }"
       >Back to services</gov-back-link
diff --git a/src/views/services/Edit.vue b/src/views/services/Edit.vue
index dde51bc6..bf985a86 100644
--- a/src/views/services/Edit.vue
+++ b/src/views/services/Edit.vue
@@ -3,7 +3,7 @@
     <ck-loader v-if="loading" />
     <template v-else>
       <vue-headful
-        :title="`One Hounslow Connect - Edit Service: ${service.name}`"
+        :title="`Hounslow Connect - Edit Service: ${service.name}`"
       />
 
       <!-- Edit form -->
diff --git a/src/views/services/Import.vue b/src/views/services/Import.vue
index d33de184..03629694 100644
--- a/src/views/services/Import.vue
+++ b/src/views/services/Import.vue
@@ -1,6 +1,6 @@
 <template>
   <gov-width-container>
-    <vue-headful title="One Hounslow Connect - Import Services" />
+    <vue-headful title="Hounslow Connect - Import Services" />
 
     <gov-back-link :to="{ name: 'services-index' }"
       >Back to Services</gov-back-link
diff --git a/src/views/services/Index.vue b/src/views/services/Index.vue
index 80a71d6a..fffc29bc 100644
--- a/src/views/services/Index.vue
+++ b/src/views/services/Index.vue
@@ -1,6 +1,6 @@
 <template>
   <gov-width-container>
-    <vue-headful title="One Hounslow Connect - List Services" />
+    <vue-headful title="Hounslow Connect - List Services" />
 
     <gov-back-link :to="{ name: 'dashboard' }">Back to dashboard</gov-back-link>
 
diff --git a/src/views/services/PostCreate.vue b/src/views/services/PostCreate.vue
index 6b4db33b..c91cf36f 100644
--- a/src/views/services/PostCreate.vue
+++ b/src/views/services/PostCreate.vue
@@ -1,6 +1,6 @@
 <template>
   <gov-width-container>
-    <vue-headful title="One Hounslow Connect - Add Service" />
+    <vue-headful title="Hounslow Connect - Add Service" />
 
     <gov-back-link
       :to="{
diff --git a/src/views/services/PreCreate.vue b/src/views/services/PreCreate.vue
index 9c19daa5..e4b009dc 100644
--- a/src/views/services/PreCreate.vue
+++ b/src/views/services/PreCreate.vue
@@ -1,6 +1,6 @@
 <template>
   <gov-width-container>
-    <vue-headful title="One Hounslow Connect - Add Service" />
+    <vue-headful title="Hounslow Connect - Add Service" />
 
     <gov-back-link :to="{ name: 'services-index' }">
       Back to services
diff --git a/src/views/services/Refresh.vue b/src/views/services/Refresh.vue
index e8e72c8e..c12df214 100644
--- a/src/views/services/Refresh.vue
+++ b/src/views/services/Refresh.vue
@@ -4,7 +4,7 @@
 
     <template v-else>
       <vue-headful
-        :title="`One Hounslow Connect - Refresh Service: ${service.name}`"
+        :title="`Hounslow Connect - Refresh Service: ${service.name}`"
       />
 
       <gov-back-link
diff --git a/src/views/services/Show.vue b/src/views/services/Show.vue
index 8a4a523d..5757ecde 100644
--- a/src/views/services/Show.vue
+++ b/src/views/services/Show.vue
@@ -6,9 +6,7 @@
     <gov-main-wrapper>
       <ck-loader v-if="loading" />
       <gov-grid-row v-else>
-        <vue-headful
-          :title="`One Hounslow Connect - Service: ${service.name}`"
-        />
+        <vue-headful :title="`Hounslow Connect - Service: ${service.name}`" />
 
         <gov-grid-column width="full">
           <gov-grid-row>
diff --git a/src/views/services/Updated.vue b/src/views/services/Updated.vue
index 59a7ebb7..4c45f9cd 100644
--- a/src/views/services/Updated.vue
+++ b/src/views/services/Updated.vue
@@ -3,7 +3,7 @@
     <ck-loader v-if="loading" />
     <template v-else>
       <vue-headful
-        :title="`One Hounslow Connect - Service Updated: ${service.name}`"
+        :title="`Hounslow Connect - Service Updated: ${service.name}`"
       />
 
       <gov-back-link
diff --git a/src/views/services/forms/AdditionalInfoTab.vue b/src/views/services/forms/AdditionalInfoTab.vue
index 8f1eeb82..03a3bae3 100644
--- a/src/views/services/forms/AdditionalInfoTab.vue
+++ b/src/views/services/forms/AdditionalInfoTab.vue
@@ -273,7 +273,7 @@ export default {
     videoEmbedHelpHref() {
       const to = "onehounslowconnect@hounslow.gov.uk";
       const subject = `Make a video for my ${this.type}`;
-      const body = `My ${this.type} is: xxx\n\nI am interested in making a video for my ${this.type} page on One Hounslow Connect.`;
+      const body = `My ${this.type} is: xxx\n\nI am interested in making a video for my ${this.type} page on Hounslow Connect.`;
 
       return `mailto:${to}?subject=${encodeURIComponent(
         subject
diff --git a/src/views/services/forms/DescriptionTab.vue b/src/views/services/forms/DescriptionTab.vue
index 2ac0c578..15b2f8bc 100644
--- a/src/views/services/forms/DescriptionTab.vue
+++ b/src/views/services/forms/DescriptionTab.vue
@@ -5,7 +5,7 @@
       <gov-grid-column width="one-half">
         <gov-body>
           These sections should describe what your {{ type }} offers and is the
-          main body of content on your page on One Hounslow Connect.
+          main body of content on your page on Hounslow Connect.
         </gov-body>
 
         <gov-section-break size="l" />
diff --git a/src/views/services/forms/DetailsTab.vue b/src/views/services/forms/DetailsTab.vue
index 235d4879..7dbe4af9 100644
--- a/src/views/services/forms/DetailsTab.vue
+++ b/src/views/services/forms/DetailsTab.vue
@@ -18,7 +18,7 @@
           "
           id="type"
           label="What is it?"
-          hint="This option changes how your page is described on One Hounslow Connect"
+          hint="This option changes how your page is described on Hounslow Connect"
           :options="typeOptions"
           :error="errors.get('type')"
         />
diff --git a/src/views/services/forms/ReferralTab.vue b/src/views/services/forms/ReferralTab.vue
index 2920a98c..0feac60c 100644
--- a/src/views/services/forms/ReferralTab.vue
+++ b/src/views/services/forms/ReferralTab.vue
@@ -53,8 +53,8 @@
               for="referral_button_text"
               v-if="referral_method === 'internal'"
             >
-              By enabling referrals through One Hounslow Connect, a button will
-              be added to your page which will link to the referral form.
+              By enabling referrals through Hounslow Connect, a button will be
+              added to your page which will link to the referral form.
             </gov-hint>
             <gov-hint
               for="referral_button_text"
@@ -162,7 +162,7 @@ export default {
     referralMethodOptions() {
       return [
         { text: "Please select", value: null, disabled: true },
-        { text: "Yes - Through One Hounslow Connect", value: "internal" },
+        { text: "Yes - Through Hounslow Connect", value: "internal" },
         { text: "Yes - Through an external form", value: "external" },
         {
           text: `No - This ${this.type} doesn’t accept referrals`,
@@ -178,7 +178,7 @@ export default {
       const subject = `Turn referrals on for my ${this.type}`;
       const body = `${this.$options.filters.ucfirst(
         this.type
-      )} Name: XXX\n\nWe are interested in finding out more about accepting referrals through One Hounslow Connect.`;
+      )} Name: XXX\n\nWe are interested in finding out more about accepting referrals through Hounslow Connect.`;
 
       return `mailto:${to}?subject=${encodeURIComponent(
         subject
diff --git a/src/views/stop-words/Edit.vue b/src/views/stop-words/Edit.vue
index f96e27a2..a7e767e5 100644
--- a/src/views/stop-words/Edit.vue
+++ b/src/views/stop-words/Edit.vue
@@ -1,6 +1,6 @@
 <template>
   <gov-width-container>
-    <vue-headful title="One Hounslow Connect - Edit Stop Words" />
+    <vue-headful title="Hounslow Connect - Edit Stop Words" />
 
     <gov-back-link :to="{ name: 'admin-index-search-engine-stop-words' }"
       >Back to stop words</gov-back-link
diff --git a/src/views/taxonomies/categories/Create.vue b/src/views/taxonomies/categories/Create.vue
index 1ba23c83..d8282254 100644
--- a/src/views/taxonomies/categories/Create.vue
+++ b/src/views/taxonomies/categories/Create.vue
@@ -1,6 +1,6 @@
 <template>
   <gov-width-container>
-    <vue-headful title="One Hounslow Connect - Add Taxonomy Category" />
+    <vue-headful title="Hounslow Connect - Add Taxonomy Category" />
 
     <gov-back-link :to="{ name: 'admin-index-taxonomies' }"
       >Back to taxonomy categories</gov-back-link
diff --git a/src/views/taxonomies/categories/Edit.vue b/src/views/taxonomies/categories/Edit.vue
index ade33174..227ef71f 100644
--- a/src/views/taxonomies/categories/Edit.vue
+++ b/src/views/taxonomies/categories/Edit.vue
@@ -3,9 +3,7 @@
     <ck-loader v-if="loading" />
     <template v-else>
       <vue-headful
-        :title="
-          `One Hounslow Connect - Edit Taxonomy Category: ${taxonomy.name}`
-        "
+        :title="`Hounslow Connect - Edit Taxonomy Category: ${taxonomy.name}`"
       />
 
       <gov-back-link :to="{ name: 'admin-index-taxonomies' }"
diff --git a/src/views/taxonomies/organisations/Create.vue b/src/views/taxonomies/organisations/Create.vue
index 92c74c47..9942a7f2 100644
--- a/src/views/taxonomies/organisations/Create.vue
+++ b/src/views/taxonomies/organisations/Create.vue
@@ -1,6 +1,6 @@
 <template>
   <gov-width-container>
-    <vue-headful title="One Hounslow Connect - Add Taxonomy Organisation" />
+    <vue-headful title="Hounslow Connect - Add Taxonomy Organisation" />
 
     <gov-back-link :to="{ name: 'admin-index-taxonomies-organisations' }"
       >Back to taxonomy organisations</gov-back-link
diff --git a/src/views/taxonomies/organisations/Edit.vue b/src/views/taxonomies/organisations/Edit.vue
index 80d424f8..3c12faee 100644
--- a/src/views/taxonomies/organisations/Edit.vue
+++ b/src/views/taxonomies/organisations/Edit.vue
@@ -4,7 +4,7 @@
     <template v-else>
       <vue-headful
         :title="
-          `One Hounslow Connect - Edit Taxonomy Organisation: ${taxonomy.name}`
+          `Hounslow Connect - Edit Taxonomy Organisation: ${taxonomy.name}`
         "
       />
 
diff --git a/src/views/taxonomies/service-eligibilities/Create.vue b/src/views/taxonomies/service-eligibilities/Create.vue
index dca5559b..7dc231c0 100644
--- a/src/views/taxonomies/service-eligibilities/Create.vue
+++ b/src/views/taxonomies/service-eligibilities/Create.vue
@@ -1,6 +1,6 @@
 <template>
   <gov-width-container>
-    <vue-headful title="One Hounslow Connect - Add Service Eligibility" />
+    <vue-headful title="Hounslow Connect - Add Service Eligibility" />
 
     <gov-back-link
       :to="{ name: 'admin-index-taxonomies-service-eligibilities' }"
diff --git a/src/views/taxonomies/service-eligibilities/Edit.vue b/src/views/taxonomies/service-eligibilities/Edit.vue
index 5257b5c2..1077f047 100644
--- a/src/views/taxonomies/service-eligibilities/Edit.vue
+++ b/src/views/taxonomies/service-eligibilities/Edit.vue
@@ -4,7 +4,7 @@
     <template v-else>
       <vue-headful
         :title="
-          `One Hounslow Connect - Edit Service Eligibility: ${serviceEligibility.name}`
+          `Hounslow Connect - Edit Service Eligibility: ${serviceEligibility.name}`
         "
       />
 
diff --git a/src/views/thesaurus/Edit.vue b/src/views/thesaurus/Edit.vue
index 18c7c10c..74bad88c 100644
--- a/src/views/thesaurus/Edit.vue
+++ b/src/views/thesaurus/Edit.vue
@@ -1,6 +1,6 @@
 <template>
   <gov-width-container>
-    <vue-headful title="One Hounslow Connect - Edit Thesaurus" />
+    <vue-headful title="Hounslow Connect - Edit Thesaurus" />
 
     <gov-back-link :to="{ name: 'admin-index-search-engine' }"
       >Back to thesaurus</gov-back-link
diff --git a/src/views/update-requests/Index.vue b/src/views/update-requests/Index.vue
index 3bdff4b9..f64f48b3 100644
--- a/src/views/update-requests/Index.vue
+++ b/src/views/update-requests/Index.vue
@@ -1,6 +1,6 @@
 <template>
   <gov-width-container>
-    <vue-headful title="One Hounslow Connect - List Update Requests" />
+    <vue-headful title="Hounslow Connect - List Update Requests" />
 
     <gov-back-link :to="{ name: 'dashboard' }">Back to dashboard</gov-back-link>
     <gov-main-wrapper>
diff --git a/src/views/update-requests/Show.vue b/src/views/update-requests/Show.vue
index d7c42b66..fee8ac79 100644
--- a/src/views/update-requests/Show.vue
+++ b/src/views/update-requests/Show.vue
@@ -1,6 +1,6 @@
 <template>
   <gov-width-container>
-    <vue-headful title="One Hounslow Connect - View Update Request" />
+    <vue-headful title="Hounslow Connect - View Update Request" />
 
     <gov-back-link :to="{ name: 'update-requests-index' }"
       >Back to update requests</gov-back-link
diff --git a/src/views/users/Create.vue b/src/views/users/Create.vue
index 705be0ec..34f71cb8 100644
--- a/src/views/users/Create.vue
+++ b/src/views/users/Create.vue
@@ -1,6 +1,6 @@
 <template>
   <gov-width-container>
-    <vue-headful title="One Hounslow Connect - Add User" />
+    <vue-headful title="Hounslow Connect - Add User" />
 
     <gov-back-link :to="{ name: 'users-index' }">Back to users</gov-back-link>
     <gov-main-wrapper>
diff --git a/src/views/users/Edit.vue b/src/views/users/Edit.vue
index 05409c77..7bcffef4 100644
--- a/src/views/users/Edit.vue
+++ b/src/views/users/Edit.vue
@@ -4,7 +4,7 @@
     <template v-else>
       <vue-headful
         :title="
-          `One Hounslow Connect - Edit User: ${user.first_name} ${user.last_name}`
+          `Hounslow Connect - Edit User: ${user.first_name} ${user.last_name}`
         "
       />
 
@@ -17,7 +17,7 @@
             <gov-heading size="xl">Users</gov-heading>
             <gov-heading size="m">Edit user</gov-heading>
             <gov-body
-              >Edit users who can acces the back-end of the One Hounslow Connect
+              >Edit users who can acces the back-end of the Hounslow Connect
               service (deciding their permissions in what they have access
               to)</gov-body
             >
diff --git a/src/views/users/Index.vue b/src/views/users/Index.vue
index 6e4d3284..8f837cc6 100644
--- a/src/views/users/Index.vue
+++ b/src/views/users/Index.vue
@@ -1,6 +1,6 @@
 <template>
   <gov-width-container>
-    <vue-headful title="One Hounslow Connect - List Users" />
+    <vue-headful title="Hounslow Connect - List Users" />
 
     <gov-back-link :to="{ name: 'dashboard' }">Back to dashboard</gov-back-link>
     <gov-main-wrapper>
diff --git a/src/views/users/Show.vue b/src/views/users/Show.vue
index 9734c802..6ef449f6 100644
--- a/src/views/users/Show.vue
+++ b/src/views/users/Show.vue
@@ -6,7 +6,7 @@
       <gov-grid-row v-else>
         <vue-headful
           :title="
-            `One Hounslow Connect - User: ${user.first_name} ${user.last_name}`
+            `Hounslow Connect - User: ${user.first_name} ${user.last_name}`
           "
         />
 

From 17a4aae1dce9936d32a252bcd9a8a06d9665e886 Mon Sep 17 00:00:00 2001
From: Stuart Laverick <stuart@appropriatesolutions.co.uk>
Date: Fri, 23 Jul 2021 16:40:35 +0100
Subject: [PATCH 5/5] Manage potential missing data in service details

---
 src/views/services/Edit.vue                   |  6 +-
 .../update-requests/show/ServiceDetails.vue   | 71 +++++++++----------
 2 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/src/views/services/Edit.vue b/src/views/services/Edit.vue
index bf985a86..e7c5f8de 100644
--- a/src/views/services/Edit.vue
+++ b/src/views/services/Edit.vue
@@ -192,7 +192,11 @@
                 :service="updateRequest.data"
                 :logo-data-uri="form.logo"
                 :gallery-items-data-uris="
-                  form.gallery_items.map(galleryItem => galleryItem.image)
+                  form.gallery_items
+                    .filter(
+                      galleryItem => typeof galleryItem.image !== 'undefined'
+                    )
+                    .map(galleryItem => galleryItem.image)
                 "
               />
 
diff --git a/src/views/update-requests/show/ServiceDetails.vue b/src/views/update-requests/show/ServiceDetails.vue
index 2e735cae..fe5c1c3c 100644
--- a/src/views/update-requests/show/ServiceDetails.vue
+++ b/src/views/update-requests/show/ServiceDetails.vue
@@ -124,7 +124,7 @@
                 :taxonomies="rootTaxonomy.children"
                 :checked="original ? original.eligibility_types.taxonomies : []"
                 :error="false"
-                :filteredTaxonomyIds="updatedServiceEligibilities"
+                :filteredTaxonomyIds="updatedServiceEligibilities()"
                 :disabled="true"
               />
               <gov-body v-if="eligibilityCustomChanged(rootTaxonomy)"
@@ -152,7 +152,7 @@
                 :taxonomies="rootTaxonomy.children"
                 :checked="service.eligibility_types.taxonomies"
                 :error="false"
-                :filteredTaxonomyIds="updatedServiceEligibilities"
+                :filteredTaxonomyIds="updatedServiceEligibilities()"
                 :disabled="true"
               />
               <gov-body v-if="eligibilityCustomChanged(rootTaxonomy)"
@@ -463,7 +463,7 @@
             <ck-carousel
               v-if="
                 original.hasOwnProperty('gallery_items') &&
-                  Array.isArray(gallery_items)
+                  Array.isArray(original.gallery_items)
               "
               :image-urls="imageUrls(original)"
             />
@@ -472,7 +472,7 @@
           <gov-table-cell :style="original ? 'width: 25%;' : 'width: 50%;'">
             <ck-carousel
               v-if="Array.isArray(service.gallery_items)"
-              :image-urls="galleryItemsDataUris || imageUrls(service)"
+              :image-urls="serviceGalleryItems"
             />
             <gov-body v-else>-</gov-body>
           </gov-table-cell>
@@ -531,38 +531,10 @@ export default {
   },
 
   computed: {
-    updatedServiceEligibilities() {
-      const originalTaxonomies = this.original
-        ? this.original.eligibility_types.taxonomies.reduce(
-            (taxonomyIds, taxonomyId) => {
-              const taxonomy = this.flattenedEligibilityTypes.find(
-                taxonomy => taxonomy.id === taxonomyId
-              );
-              return taxonomyIds.concat(
-                this.getTaxonomyAndAncestorsIds(
-                  taxonomy,
-                  this.flattenedEligibilityTypes
-                )
-              );
-            },
-            []
-          )
-        : [];
-      const updatedTaxonomies = this.service.eligibility_types.taxonomies.reduce(
-        (taxonomyIds, taxonomyId) => {
-          const taxonomy = this.flattenedEligibilityTypes.find(
-            taxonomy => taxonomy.id === taxonomyId
-          );
-          return taxonomyIds.concat(
-            this.getTaxonomyAndAncestorsIds(
-              taxonomy,
-              this.flattenedEligibilityTypes
-            )
-          );
-        },
-        []
-      );
-      return Array.from(new Set(originalTaxonomies.concat(updatedTaxonomies)));
+    serviceGalleryItems() {
+      return this.galleryItemsDataUris && this.galleryItemsDataUris.length > 0
+        ? this.galleryItemsDataUris
+        : this.imageUrls(this.service);
     }
   },
 
@@ -656,6 +628,31 @@ export default {
       return ids;
     },
 
+    getServiceEligibilityIds(service) {
+      return service.eligibility_types.taxonomies.reduce(
+        (taxonomyIds, taxonomyId) => {
+          const taxonomy = this.flattenedEligibilityTypes.find(
+            taxonomy => taxonomy.id === taxonomyId
+          );
+          return taxonomyIds.concat(
+            this.getTaxonomyAndAncestorsIds(
+              taxonomy,
+              this.flattenedEligibilityTypes
+            )
+          );
+        },
+        []
+      );
+    },
+
+    updatedServiceEligibilities() {
+      const originalTaxonomies = this.original
+        ? this.getServiceEligibilityIds(this.original)
+        : [];
+      const updatedTaxonomies = this.getServiceEligibilityIds(this.service);
+      return Array.from(new Set(originalTaxonomies.concat(updatedTaxonomies)));
+    },
+
     imageUrls(service) {
       return service.gallery_items.map(galleryItem => {
         if (galleryItem.hasOwnProperty("url")) {
@@ -675,7 +672,7 @@ export default {
     eligibilityTaxonomyChanged(eligibilityRoot) {
       return (
         this.service.hasOwnProperty("eligibility_types") &&
-        this.updatedServiceEligibilities.includes(eligibilityRoot.id)
+        this.updatedServiceEligibilities().includes(eligibilityRoot.id)
       );
     },
     eligibilityCustomChanged(eligibilityRoot) {