diff --git a/.env.local b/.env.local
index 167508e9..f0006e64 100644
--- a/.env.local
+++ b/.env.local
@@ -33,4 +33,4 @@ I18N_DOMAIN = "cymru.local"
 GOOGLE_TAG_MANAGER = GTM-T78CBC3
 SHOWLOGIN = "false"
 SHOWREPRESENTATIONS = "false"
-BASIC_AUTH_CREDENTIALS = pinswg:password|pinswg2:password2
\ No newline at end of file
+BASIC_AUTH_CREDENTIALS,,= pinswg:password|pinswg2:password2
\ No newline at end of file
diff --git a/components/account/personaldetailsComplete.js b/components/account/personaldetailsComplete.js
index a3a3b01e..2740f5a8 100644
--- a/components/account/personaldetailsComplete.js
+++ b/components/account/personaldetailsComplete.js
@@ -35,7 +35,10 @@ const PersonalDetailsComplete = (props) => {
         let contactid = props.accountDetails.loggedinUserId;
         let updateBody = props.props.props.form.personalDetailsForm.values;
         updateAccount(contactid, updateBody);
-    }, []);
+    }, [
+        props.accountDetails.loggedinUserId,
+        props.props.props.form.personalDetailsForm.values,
+    ]);
 
     return (
         <>
diff --git a/components/cookiemanager/index.js b/components/cookiemanager/index.js
index 52766403..226a7b6c 100644
--- a/components/cookiemanager/index.js
+++ b/components/cookiemanager/index.js
@@ -42,7 +42,9 @@ const CookieManagementMain = (props) => {
                 ";expires=Thu, 01 Jan 1970 00:00:01 GMT";
         }
 
-        usageState == "revoked" && delete_cookie("CookiePolicy", "/");
+        usageState == "revoked" && delete_cookie("CookiePolicy", "/"),
+            delete_cookie("_ga", "/"),
+            delete_cookie("_gid", "/");
 
         cookie.set("planning_casework", true, {
             expires: expDate,
diff --git a/components/homepage/login.js b/components/homepage/login.js
index 656c5e1a..823ffd80 100644
--- a/components/homepage/login.js
+++ b/components/homepage/login.js
@@ -159,7 +159,7 @@ let Login = (props) => {
                   shallow: true,
               })
             : "";
-    }, []);
+    }, [cookies.pinsUser, router]);
 
     return (
         <div className="card" id="login-card">
diff --git a/components/newappeal/complete.js b/components/newappeal/complete.js
index e7ee1daa..1dced394 100644
--- a/components/newappeal/complete.js
+++ b/components/newappeal/complete.js
@@ -56,6 +56,7 @@ let CompleteAppeal = (props) => {
         props.props.form.appealForm.values,
         props.appealType.appealLPA,
         props.props.accountDetails.loggedinUserId,
+        props.appealType.appealTypeID,
     ]);
 
     const getFormCollection = (formtype) => {
diff --git a/pages/_document.js b/pages/_document.js
index 26ce09df..02037684 100644
--- a/pages/_document.js
+++ b/pages/_document.js
@@ -9,6 +9,17 @@ class MyDocument extends Document {
 
         let useGATracking = false;
 
+        // remove this block when not need after softlaunch
+        let hasBasicAuth =
+            typeof process.env.BASIC_AUTH_CREDENTIALS != "undefined";
+
+        if (ctx.req && ctx.res) {
+            hasBasicAuth &&
+                (await basicAuthMiddleware(ctx.req, ctx.res, {
+                    users: process.env.BASIC_AUTH_CREDENTIALS,
+                }));
+        }
+
         if (ctx.req && ctx.req.headers.cookie) {
             typeof ctx.req.cookies.CookiePolicy != "undefined"
                 ? JSON.parse(ctx.req.cookies.CookiePolicy).usage == "accepted"
@@ -19,12 +30,6 @@ class MyDocument extends Document {
             useGATracking = false;
         }
 
-        // if (ctx.req && ctx.res) {
-        //     await basicAuthMiddleware(ctx.req, ctx.res, {
-        //         users: process.env.BASIC_AUTH_CREDENTIALS,
-        //     });
-        // }
-
         return { ...initialProps, useGATracking };
     }