diff --git a/.env.local b/.env.local
index c4b68891..07d2d4a8 100644
--- a/.env.local
+++ b/.env.local
@@ -1,8 +1,8 @@
 ACCESS_TOKEN_ENDPOINT = https://login.microsoftonline.com/
 //ESNR Tenant
-TENANT = a8d860de-d5e1-45af-8376-d93f02e6b502
+//TENANT = a8d860de-d5e1-45af-8376-d93f02e6b502
 //WGO Tenant
-//TENANT = 9ac1a5ab-cd58-409e-a1b6-6b10422a68f5
+TENANT = 9ac1a5ab-cd58-409e-a1b6-6b10422a68f5
 GRANT_TYPE = "client_credentials"
 
 HASHKEY = 028ffbae928d7191c0017f298260995f901d78eabde1436c0af0423459cc3715832136d84f68818d3a96399467b52143e273d4f3bf4ae190848891535421cd6c
@@ -10,8 +10,8 @@ NEXT_PUBLIC_HASHKEY = 028ffbae928d7191c0017f298260995f901d78eabde1436c0af0423459
 
 
 //Dev oauth ESNR
-CLIENT_ID = e082def0-3453-461f-9a5e-f4ab127dc015
-CLIENT_SECRET = qW.7Q~TSr3sZmLEnJQJPXEdOckb_yo2t1yJmY
+CLIENT_ID = 9b834097-03d7-409b-b038-ecfec31a394a
+CLIENT_SECRET = 4Vt8Q~olL1hx7n01B0~tXf-N2YL5DyC_Fk6waagX
 RELAY_ROOT = https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/
 RELAYURI = "dev-pedw-ns.servicebus.windows.net"
 RELAYPATH = "dev-pedw-hc"
diff --git a/.eslintrc b/.eslintrc
index f03a56fe..ee1d2c9f 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,6 +1,9 @@
 {
-  "extends": "next",
+  "extends": "next/core-web-vitals",
   "rules": {
-    "@next/next/no-img-element": "off"
+    "@next/next/no-img-element": "off",
+    "react/no-unknown-property": "error"
   }
 }
+
+
diff --git a/components/breadcrumbs.js b/components/breadcrumbs.js
index bc892385..c7f681a5 100644
--- a/components/breadcrumbs.js
+++ b/components/breadcrumbs.js
@@ -744,7 +744,7 @@ const Breadcrumbs = (props) => {
                         {router.pathname == "/auth/signin" ? (
                             <>
                                 <li className="govuk-breadcrumbs__list-item">
-                                    Sign in
+                                    {t("auth:auth-page-title")}
                                 </li>
                             </>
                         ) : (
@@ -753,7 +753,16 @@ const Breadcrumbs = (props) => {
                         {router.pathname == "/auth/verify-request" ? (
                             <>
                                 <li className="govuk-breadcrumbs__list-item">
-                                    Check your email
+                                    {t("auth:auth-check-email-page-title")}
+                                </li>
+                            </>
+                        ) : (
+                            ""
+                        )}
+                        {router.pathname == "/auth/error" ? (
+                            <>
+                                <li className="govuk-breadcrumbs__list-item">
+                                    {t("auth:auth-error-signin-error-title")}
                                 </li>
                             </>
                         ) : (
diff --git a/components/case/documents.js b/components/case/documents.js
index 21218c5c..9194b687 100644
--- a/components/case/documents.js
+++ b/components/case/documents.js
@@ -387,7 +387,7 @@ const DocumentDetails = (props) => {
         getSearchDocumentTypes(props.incidentid).then((data) => {
             setDocumentTypes(data);
         });
-    });
+    }, [props.incidentid]);
 
     const getDocumentResults = useCallback(
         (pageNumber, orderBy, fieldSort) => {
diff --git a/components/cookiemanager/index.js b/components/cookiemanager/index.js
index 93c01dbb..b4dc457a 100644
--- a/components/cookiemanager/index.js
+++ b/components/cookiemanager/index.js
@@ -205,7 +205,6 @@ const CookieManagementMain = (props) => {
                                                     name="usage"
                                                     className="govuk-radios__input"
                                                     id="usage-1"
-                                                    component="input"
                                                     type="radio"
                                                     value="revoked"
                                                     checked={
@@ -234,7 +233,6 @@ const CookieManagementMain = (props) => {
                                                     name="usage"
                                                     type="radio"
                                                     value="accepted"
-                                                    component="input"
                                                     checked={
                                                         usageState ===
                                                         "accepted"
@@ -352,7 +350,6 @@ const CookieManagementMain = (props) => {
                                                 name="settings"
                                                 type="radio"
                                                 value="revoked"
-                                                component="input"
                                                 checked={
                                                     settingsState === "revoked"
                                                 }
@@ -379,7 +376,6 @@ const CookieManagementMain = (props) => {
                                                 name="settings"
                                                 type="radio"
                                                 value="accepted"
-                                                component="input"
                                                 checked={
                                                     settingsState === "accepted"
                                                 }
diff --git a/components/elements/index.js b/components/elements/index.js
index 98533d8d..6fc76b5e 100644
--- a/components/elements/index.js
+++ b/components/elements/index.js
@@ -94,7 +94,7 @@ export function Textfield(props) {
                         type="text"
                         name={name}
                         id={props.name}
-                        component={RenderCaseID}
+                        //component={RenderCaseID}
                         value={ticketnumber}
                         className="govuk-input  govuk-input--width-20"
                         disabled
@@ -1195,7 +1195,7 @@ export function ReadOnlyfield(props) {
                     type="text"
                     name={props.name}
                     id={props.name}
-                    component={RenderCaseID}
+                    //component={RenderCaseID}
                     value={value}
                     className="govuk-input  govuk-input--width-20"
                     disabled
diff --git a/components/homepage/login.js b/components/homepage/login.js
index c47d0b0f..99e53b97 100644
--- a/components/homepage/login.js
+++ b/components/homepage/login.js
@@ -189,28 +189,6 @@ let Login = (props) => {
             : "";
     }, [cookies.pinsUser, router]);
 
-    const govGatwayLoginRedirect = () => {
-        let ggUrl =
-            props.govGateway.config.authorization_endpoint +
-            "?response_type=code&scope=openid&client_id=" +
-            GG_CLIENT_ID +
-            "&redirect_uri=" +
-            GG_REDIRECT_URI +
-            "&ui_locales=" +
-            (router.locale == "cy" ? "cy" : "en-GB");
-
-        console.log("login Url:", ggUrl);
-
-        router.replace(ggUrl);
-    };
-
-    const govGatwayForgottenLink = () => {
-        let ggUrl =
-            props.govGateway.config.authorization_endpoint +
-            "/login/forgot-password";
-        router.replace(ggUrl);
-    };
-
     if (session === "loading") {
         return <h1>loading...</h1>;
     }
@@ -229,7 +207,8 @@ let Login = (props) => {
             <div className="card" id="login-card">
                 <div className="card-body active">
                     <h3 className="heading-small card-heading">
-                        {t("home:login-card-title")}
+                        {/* {t("home:login-card-title")} */}
+                        {t("home:login-card-title-temp")}
                     </h3>{" "}
                     <div className="govuk-form-group govuk-!-margin-top-4">
                         <div className="govuk-body">
@@ -240,9 +219,13 @@ let Login = (props) => {
                             <button
                                 className="govuk-button withChevron govuk-button-cta"
                                 type="button"
-                                onClick={() => signIn("email")}
+                                onClick={() =>
+                                    signIn("email", {
+                                        callbackUrl: "/myportal",
+                                    })
+                                }
                             >
-                                Sign in with email address
+                                {t("home:login-via-nextuth-label")}
                             </button>
                         )}
                         {session && (
@@ -255,7 +238,13 @@ let Login = (props) => {
                             </button>
                         )}
                     </div>
-                    <form onSubmit={handleSubmit(onHandleSubmit)}>
+                    <p className="govuk-body-s">
+                        {t("home:login-comingsoon-temp-1")}{" "}
+                    </p>
+                    <p className="govuk-body-s">
+                        {t("home:login-comingsoon-temp-1a")}{" "}
+                    </p>
+                    {/* <form onSubmit={handleSubmit(onHandleSubmit)}>
                         {validLoginID == false && (
                             <div className="govuk-error-message govuk-form-group--error">
                                 Incorrect username or password
@@ -281,14 +270,6 @@ let Login = (props) => {
                         />
 
                         <Field
-                            // validate={[
-                            //     required(
-                            //         t("home:casesearch-search-validation-required")
-                            //     ),
-                            //     minLength(
-                            //         t("home:casesearch-search-validation-minlength")
-                            //     ),
-                            // ]}
                             className="govuk-input"
                             component={RenderPasswordfield}
                             id="loginUserPassword"
@@ -302,9 +283,9 @@ let Login = (props) => {
                                 {t("home:login-card-button")}
                             </button>
                         </div>
-                    </form>
-                    {/*  <div className="govuk-form-group govuk-!-margin-top-4">
-                        <p className="govuk-body-xs">
+                    </form> */}
+                    <div className="govuk-form-group govuk-!-margin-top-4">
+                        {/*    <p className="govuk-body-xs">
                             <a
                                 onClick={() => {
                                     govGatwayLoginRedirect();
@@ -327,7 +308,8 @@ let Login = (props) => {
                                 {t("home:login-card-register-link")}
                             </a>
                         </p>
-                        <p className="govuk-body-s">
+                        */}
+                        {/* <p className="govuk-body-s">
                             <a
                                 onClick={() => {
                                     govGatwayForgottenLink();
@@ -336,7 +318,7 @@ let Login = (props) => {
                             >
                                 {t("home:login-card-forgotten-label")}{" "}
                             </a>
-                        </p>
+                        </p> */}
                         <hr className="govuk-!-margin-bottom-4" />
                         <p className="govuk-body-s">
                             {t("home:login-comingsoon-temp-2")}
@@ -405,7 +387,7 @@ let Login = (props) => {
                                 {t("home:login-contact-email")}
                             </a>
                         </p>
-                    </div> */}
+                    </div>
                 </div>
 
                 {/* <LoadingOverlay
diff --git a/components/main.js b/components/main.js
index 0b0a2ed0..6b6ad1ff 100644
--- a/components/main.js
+++ b/components/main.js
@@ -25,10 +25,7 @@ const MainHome = (props) => {
             <div className="govuk-grid-row">
                 <div className="govuk-grid-column-full">
                     <div className="flex-container grid-row govuk-body ">
-                        <LoginSoon />
-                        <CaseSearch />
-                        <CaseComment />
-                        <Dns />
+                        <CaseSearch /> <Dns />
                         {showLogin == "true" && (
                             <Login
                                 GG_CLIENT_ID={GG_CLIENT_ID}
@@ -36,6 +33,8 @@ const MainHome = (props) => {
                                 session={session}
                             />
                         )}
+                        {showLogin != "true" && <LoginSoon />}
+                        <CaseComment />
                         {/*   <Inspectorate /> */}
                     </div>
                 </div>
diff --git a/components/newappeal/complete.js b/components/newappeal/complete.js
index 4bb254d9..9670ee4a 100644
--- a/components/newappeal/complete.js
+++ b/components/newappeal/complete.js
@@ -66,6 +66,7 @@ let CompleteAppeal = (props) => {
         props.appealType.appealLPA,
         props.props.accountDetails.loggedinUserId,
         props.appealType.appealTypeID,
+        props.props.accountDetails.loggedinUserEmail,
     ]);
 
     let { t } = useTranslation();
diff --git a/components/timeout/timeoutmodal.js b/components/timeout/timeoutmodal.js
index 4b60749f..fadd8c82 100644
--- a/components/timeout/timeoutmodal.js
+++ b/components/timeout/timeoutmodal.js
@@ -6,6 +6,7 @@ const TimeoutModal = (props) => {
 
     return (
         <div className={showModal == false ? "modal fade" : "modal fade show"}>
+            {/* <div backdrop="static" className="modal-dialog"> */}
             <div backdrop="static" className="modal-dialog">
                 <div className="modal-content">
                     <h3>
diff --git a/components/tracking/index.js b/components/tracking/index.js
index 4ade8ccb..7cf5fa1b 100644
--- a/components/tracking/index.js
+++ b/components/tracking/index.js
@@ -1,8 +1,11 @@
 import React, { Fragment } from "react";
+import Script from "next/script";
 
 export const Tracking = ({ googleTagManagerID, nonce }) => (
     <Fragment>
-        <script
+        <Script
+            id="google-analytics"
+            strategy="afterInteractive"
             nonce={nonce}
             dangerouslySetInnerHTML={{
                 __html: `(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
diff --git a/i18n.js b/i18n.js
index 864fa98b..d90f7d71 100644
--- a/i18n.js
+++ b/i18n.js
@@ -48,5 +48,8 @@ module.exports = {
         "/details-about-cookies": ["common", "cookies"],
         "/terms-and-conditions": ["common"],
         "/account/passwordreset": ["common", "home"],
+        "/auth/signin": ["common", "common", "auth"],
+        "/auth/verify-request": ["common", "common", "auth"],
+        "/auth/error": ["common", "common", "auth"],
     },
 };
diff --git a/locales/cy/auth.json b/locales/cy/auth.json
new file mode 100644
index 00000000..7c14ab0a
--- /dev/null
+++ b/locales/cy/auth.json
@@ -0,0 +1,21 @@
+{
+    "auth-page-title": "Mewngofnodi",
+    "auth-email-label": "Cyfeiriad ebost",
+    "auth-signin-button-label": "Mewngofnodwch gyda'ch e-bost",
+    "auth-check-email-page-title": "Gwiriwch eich e-bost",
+    "auth-check-email-message": "Mae dolen wedi'i hanfon i'ch e-bost er mwyn i chi allu parhau. Caewch y ffenestr hon.",
+    "auth-return-home-link-label": "Dychwelyd i Gartref",
+    "auth-error-signin-error-title": "Gwall Mewngofnodi",
+    "auth-error-heading": "Mae gwall wedi bod",
+    "auth-error-Signin-label": "Ceisiwch arwyddo gyda chyfrif gwahanol.",
+    "auth-error-OAuthSignin-label": "Ceisiwch arwyddo gyda chyfrif gwahanol.",
+    "auth-error-OAuthCallback-label": "Ceisiwch arwyddo gyda chyfrif gwahanol.",
+    "auth-error- OAuthCreateAccount-label": "Ceisiwch arwyddo gyda chyfrif gwahanol.",
+    "auth-error-EmailCreateAccount-label": "Ceisiwch arwyddo gyda chyfrif gwahanol.",
+    "auth-error-Callback-label": "Ceisiwch arwyddo gyda chyfrif gwahanol.",
+    "auth-error-OAuthAccountNotLinked-label": "I gadarnhau pwy ydych, mewngofnodwch gyda'r un cyfrif a ddefnyddiwyd gennych yn wreiddiol.",
+    "auth-error-EmailSignin-label": "Gwiriwch eich cyfeiriad e-bost.",
+    "auth-error-CredentialsSignin-label": "Methodd mewngofnodi. Gwiriwch fod y manylion a ddarparwyd gennych yn gywir.",
+    "auth-error-Verification-label": "Methu mewngofnodi. Nid yw'r ddolen mewngofnodi yn ddilys bellach. Efallai ei fod wedi cael ei ddefnyddio eisoes neu efallai ei fod wedi dod i ben.",
+    "auth-error-default-label": "Methu mewngofnodi."
+}
\ No newline at end of file
diff --git a/locales/cy/home.json b/locales/cy/home.json
index 4bef2d41..f48950f8 100644
--- a/locales/cy/home.json
+++ b/locales/cy/home.json
@@ -1,6 +1,7 @@
 {
     "login-card-title-temp": "Apeliadau neu geisiadau newydd",
     "login-comingsoon-temp-1": "Mae'r gwasanaeth hwn yn cael ei ddatblygu i gefnogi apeliadau a cheisiadau ar-lein.",
+    "login-comingsoon-temp-1a": "Ar hyn o bryd gallwch godi Apeliadau Cynllunio a78, Caniatâd Adeilad Rhestredig ac Ardal Gadwraeth, Apeliadau Deiliaid Tai a Mân Apeliadau Masnachol - HAS/CAS, Hysbysebion ac apeliadau Dilysu.",
     "login-comingsoon-temp-2": "Wrth i ni ddatblygu’r gwasanaeth ar-lein, dewch o hyd i:",
     "login-comingsoon-forms-link-1": "https://llyw.cymru/ffurflenni-apelio",
     "login-comingsoon-forms-label-1": "ffurflenni apêl cynllunio a ffurflenni cais cynllunio",
@@ -22,6 +23,7 @@
     "login-card-forgotten-label": "Rwyf wedi anghofio fy nghyfrinair",
     "login-card-forgotten-link": "Cliciwch yma",
     "login-via-gov-gateway-label": "Mewngofnodi trwy Borth y Llywodraeth",
+    "login-via-nextuth-label": "Mewngofnodwch gyda'ch cyfeiriad e-bost",
     "casesearch-card-title": "Chwilio apeliadau a Datblygiadau o Arwyddocâd Cenedlaethol",
     "casesearch-card-search-hint": "Defnyddiwch gyfeimod yr achos neu deitl DAC i chwilio. Bydd cyfeirnod yr achos yn debyg i un o'r canlynol:",
     "casesearch-card-search-example-label-1": "APP-A12345-A-21-1234567",
diff --git a/locales/en/auth.json b/locales/en/auth.json
new file mode 100644
index 00000000..1d3ac756
--- /dev/null
+++ b/locales/en/auth.json
@@ -0,0 +1,21 @@
+{
+    "auth-page-title": "Sign in",
+    "auth-email-label": "Email address",
+    "auth-signin-button-label": "Sign in with your email",
+    "auth-check-email-page-title": "Check your email",
+    "auth-check-email-message": "A link has been sent to your email so you can continue. Please close this window.",
+    "auth-return-home-link-label": "Return to Home",
+    "auth-error-signin-error-title": "Sign in Error",
+    "auth-error-heading": "There has been an error",
+    "auth-error-Signin-label": "Try signing with a different account.",
+    "auth-error-OAuthSignin-label": "Try signing with a different account.",
+    "auth-error-OAuthCallback-label": "Try signing with a different account.",
+    "auth-error- OAuthCreateAccount-label": "Try signing with a different account.",
+    "auth-error-EmailCreateAccount-label": "Try signing with a different account.",
+    "auth-error-Callback-label": "Try signing with a different account.",
+    "auth-error-OAuthAccountNotLinked-label": "To confirm your identity, sign in with the same account you used originally.",
+    "auth-error-EmailSignin-label": "Check your email address.",
+    "auth-error-CredentialsSignin-label": "Sign in failed. Check the details you provided are correct.",
+    "auth-error-Verification-label": "Unable to sign in. The sign in link is no longer valid.It may have been used already or it may have expired. ",
+    "auth-error-default-label": "Unable to sign in."
+}
\ No newline at end of file
diff --git a/locales/en/home.json b/locales/en/home.json
index 66d34415..6d66e076 100644
--- a/locales/en/home.json
+++ b/locales/en/home.json
@@ -1,6 +1,7 @@
 {
     "login-card-title-temp": "New appeals or applications",
     "login-comingsoon-temp-1": "This service is being developed to support online appeals and applications.",
+    "login-comingsoon-temp-1a": "You can currently raise Planning Appeals s78, Listed Building and Conservation Area Consent, Householder and Minor Commercial Appeals - HAS/CAS, Adverts and Non-Validation appeals.",
     "login-comingsoon-temp-2": "While we develop the online service, find:",
     "login-comingsoon-forms-link-1": "https://gov.wales/planning-appeal-forms",
     "login-comingsoon-forms-label-1": "planning appeal and application forms",
@@ -22,6 +23,7 @@
     "login-card-forgotten-label": "I have forgotten my password",
     "login-card-forgotten-link": "Click here",
     "login-via-gov-gateway-label": "Log in via Government Gateway",
+    "login-via-nextuth-label": "Sign in with your email address",
     "casesearch-card-title": "Search appeals and Developments of National Significance",
     "casesearch-card-search-hint": "Use the case reference or DNS title to search. Case reference will be similar to one of the following:",
     "casesearch-card-search-example-label-1": "APP-A12345-A-21-1234567",
diff --git a/package.json b/package.json
index 586bc6a8..cc2f6be4 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,8 @@
     "dev": "next dev",
     "dev:app": "node ./server/server.js",
     "build": "NODE_ENV=production node_modules/next/dist/bin/next build",
-    "start": "node_modules/next/dist/bin/next start"
+    "start": "node_modules/next/dist/bin/next start",
+    "lint": "next lint"
   },
   "dependencies": {
     "@azure/identity": "^2.0.5",
@@ -86,4 +87,4 @@
     "prettier": "2.5.1",
     "prisma": "^3.12.0"
   }
-}
+}
\ No newline at end of file
diff --git a/pages/auth/error.js b/pages/auth/error.js
index 2d0113b0..b8142769 100644
--- a/pages/auth/error.js
+++ b/pages/auth/error.js
@@ -16,20 +16,17 @@ const Error = (props) => {
     const { error } = useRouter().query;
 
     const errors = {
-        Signin: "Try signing with a different account.",
-        OAuthSignin: "Try signing with a different account.",
-        OAuthCallback: "Try signing with a different account.",
-        OAuthCreateAccount: "Try signing with a different account.",
-        EmailCreateAccount: "Try signing with a different account.",
-        Callback: "Try signing with a different account.",
-        OAuthAccountNotLinked:
-            "To confirm your identity, sign in with the same account you used originally.",
-        EmailSignin: "Check your email address.",
-        CredentialsSignin:
-            "Sign in failed. Check the details you provided are correct.",
-        Verification:
-            "Unable to sign in. The sign in link is no longer valid.It may have been used already or it may have expired. ",
-        default: "Unable to sign in.",
+        Signin: t("auth:auth-error-Signin-label"),
+        OAuthSignin: t("auth:auth-error-OAuthSignin-label"),
+        OAuthCallback: t("auth:auth-error-OAuthCallback-label"),
+        OAuthCreateAccount: t("auth:auth-error-OAuthCreateAccount-label"),
+        EmailCreateAccount: t("auth:auth-error-EmailCreateAccount-label"),
+        Callback: t("auth:auth-error-Callback-label"),
+        OAuthAccountNotLinked: t("auth:auth-error-OAuthAccountNotLinked-label"),
+        EmailSignin: t("auth:auth-error-EmailSignin-label"),
+        CredentialsSignin: t("auth:auth-error-CredentialsSignin-label"),
+        Verification: t("auth:auth-error-Verification-label"),
+        default: t("auth:auth-error-default-label"),
     };
 
     const errorMessage = error && (errors[error] ?? errors.default);
@@ -37,7 +34,10 @@ const Error = (props) => {
     return (
         <div>
             <Head>
-                <title>Sign in Error - {t("common:service-name")}</title>
+                <title>
+                    {t("auth:auth-error-signin-error-title")} -{" "}
+                    {t("common:service-name")}
+                </title>
             </Head>
             <div id="page_wrapper">
                 <CookieBanner />
@@ -48,7 +48,7 @@ const Error = (props) => {
                     <main className="govuk-main-wrapper govuk-!-padding-top-0 govuk-!-padding-bottom-9">
                         <div className="govuk-grid-row ">
                             <div className="govuk-grid-column-two-thirds ">
-                                <h1>There has been an error </h1>
+                                <h1>{t("auth:auth-error-heading")}</h1>
                             </div>
                         </div>
                         <div className="govuk-grid-row">
@@ -58,8 +58,9 @@ const Error = (props) => {
                         </div>
                         <div className="govuk-grid-row">
                             <div className="govuk-grid-column-two-thirds govuk-body">
-                                {" "}
-                                <Link href="/">Return to Home</Link>
+                                <Link href="/">
+                                    {t("auth:auth-return-home-link-label")}
+                                </Link>
                             </div>
                         </div>
                     </main>
diff --git a/pages/auth/signin.js b/pages/auth/signin.js
index e389cf3b..be7db3da 100644
--- a/pages/auth/signin.js
+++ b/pages/auth/signin.js
@@ -14,7 +14,9 @@ const SignIn = (props) => {
     return (
         <div>
             <Head>
-                <title>Sign in - {t("common:service-name")}</title>
+                <title>
+                    {t("auth:auth-page-title")} - {t("common:service-name")}
+                </title>
             </Head>
             <div id="page_wrapper">
                 <CookieBanner />
@@ -24,7 +26,7 @@ const SignIn = (props) => {
                     <main className="govuk-main-wrapper govuk-!-padding-top-0 govuk-!-padding-bottom-9">
                         <div className="govuk-grid-row ">
                             <div className="govuk-grid-column-two-thirds ">
-                                <h1>Sign in</h1>
+                                <h1>{t("auth:auth-page-title")} </h1>
                             </div>
                         </div>
                         <div className="govuk-grid-row">
@@ -44,7 +46,7 @@ const SignIn = (props) => {
                                             className="govuk-label"
                                             htmlFor="email"
                                         >
-                                            Email address{" "}
+                                            {t("auth:auth-email-label")}
                                         </label>
                                         <input
                                             className="govuk-input  govuk-!-width-three-quarters"
@@ -58,7 +60,7 @@ const SignIn = (props) => {
                                             type="submit"
                                             className="govuk-button"
                                         >
-                                            Sign in with your email
+                                            {t("auth:auth-signin-button-label")}
                                         </button>
                                     </div>
                                 </form>
diff --git a/pages/auth/verify-request.js b/pages/auth/verify-request.js
index 54dcac67..232347b3 100644
--- a/pages/auth/verify-request.js
+++ b/pages/auth/verify-request.js
@@ -15,7 +15,10 @@ const SignIn = (props) => {
     return (
         <div>
             <Head>
-                <title>Sign in - {t("common:service-name")}</title>
+                <title>
+                    {t("auth:auth-check-email-page-title")} -{" "}
+                    {t("common:service-name")}
+                </title>
             </Head>
             <div id="page_wrapper">
                 <CookieBanner />
@@ -26,19 +29,20 @@ const SignIn = (props) => {
                     <main className="govuk-main-wrapper govuk-!-padding-top-0 govuk-!-padding-bottom-9">
                         <div className="govuk-grid-row ">
                             <div className="govuk-grid-column-two-thirds ">
-                                <h1>Check your email</h1>
+                                <h1>{t("auth:auth-check-email-page-title")}</h1>
                             </div>
                         </div>
                         <div className="govuk-grid-row">
                             <div className="govuk-grid-column-two-thirds govuk-body">
-                                A link has been sent to your email so you can
-                                continue. Please close this window.
+                                {t("auth:auth-check-email-message")}
                             </div>
                         </div>
                         <div className="govuk-grid-row">
                             <div className="govuk-grid-column-two-thirds govuk-body">
                                 {" "}
-                                <Link href="/">Return to Home</Link>
+                                <Link href="/">
+                                    {t("auth:auth-return-home-link-label")}
+                                </Link>
                             </div>
                         </div>
                     </main>
diff --git a/pages/error.js b/pages/error.js
index 39bb90f0..68fe06a8 100644
--- a/pages/error.js
+++ b/pages/error.js
@@ -33,7 +33,7 @@ function Error({ statusCode }, props) {
                                 </p>
 
                                 <a
-                                    href="/"
+                                    href="#"
                                     className="govuk-link"
                                     onClick={() => {
                                         destroyCookie({}, "pinsUser"),