diff --git a/components/account/changepassword.js b/components/account/changepassword.js
index 20d173a9..5e32af17 100644
--- a/components/account/changepassword.js
+++ b/components/account/changepassword.js
@@ -1,6 +1,6 @@
 import Link from "next/link";
 import _ from "lodash";
-import React, { useState } from "react";
+import React, { useState, useEffect } from "react";
 import { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
 import {
@@ -10,6 +10,7 @@ import {
     getFormSubmitErrors,
 } from "redux-form";
 import { useDispatch, useSelector, shallowEqual, connect } from "react-redux";
+import { updatePassword } from "../../actions";
 
 const RenderTextfield = ({
     id,
@@ -75,6 +76,10 @@ const ChangePassword = (props) => {
     let errorsobj = {};
 
     const onHandleSubmit = (values) => {
+        let contactid = props.props.accountDetails.loggedinUserId;
+        let updateBody = props.props.form.changepasswordForm.values.newpassword;
+        console.log(contactid, updateBody);
+        updatePassword(contactid, updateBody);
         setPasswordUpdated(true);
     };
 
@@ -123,12 +128,25 @@ const ChangePassword = (props) => {
                         >
                             Continue
                         </button>
+                        <Link
+                            href={
+                                "/myportal?q=" +
+                                props.accountDetails.loggedinUserId
+                            }
+                        >
+                            <a className="govuk-link">Cancel</a>
+                        </Link>
                     </div>
                 </form>
             ) : (
                 <>
                     <p className="govuk-body">
-                        <Link href="/myportal">
+                        <Link
+                            href={
+                                "/myportal?q=" +
+                                props.accountDetails.loggedinUserId
+                            }
+                        >
                             <a className="govuk-link">Go to My Portal</a>
                         </Link>
                     </p>
@@ -144,6 +162,7 @@ const mapStateToProps = (state) => {
         searchResultsObj: state.searchResultsObj,
         formData: state.formData,
         appealType: state.appealType,
+        accountDetails: state.accountDetails,
         //form: state.form,
     };
 };
diff --git a/components/account/personaldetails.js b/components/account/personaldetails.js
index 1a4b6efe..70f449db 100644
--- a/components/account/personaldetails.js
+++ b/components/account/personaldetails.js
@@ -226,6 +226,14 @@ let PersonalDetails = (props) => {
                             >
                                 Continue
                             </button>
+                            <Link
+                                href={
+                                    "/myportal?q=" +
+                                    props.props.accountDetails.loggedinUserId
+                                }
+                            >
+                                <a className="govuk-link">Cancel</a>
+                            </Link>
                         </div>
                     </form>
                 ) : (
diff --git a/components/account/personaldetailsCheck.js b/components/account/personaldetailsCheck.js
index d16a2b53..dddeea69 100644
--- a/components/account/personaldetailsCheck.js
+++ b/components/account/personaldetailsCheck.js
@@ -1,4 +1,5 @@
 import _ from "lodash";
+import Link from "next/link";
 import React, { useState } from "react";
 import { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
@@ -39,7 +40,7 @@ const BuildCheckPersonalDetails = (props) => {
                     <dd className="govuk-summary-list__actions">
                         <a
                             className="govuk-link"
-                            href="#"
+                            href="#firstname"
                             onClick={() => {
                                 setPersonalDetailsComplete(false);
                             }}
@@ -62,7 +63,7 @@ const BuildCheckPersonalDetails = (props) => {
                     <dd className="govuk-summary-list__actions">
                         <a
                             className="govuk-link"
-                            href="#"
+                            href="#lastname"
                             onClick={() => {
                                 setPersonalDetailsComplete(false);
                             }}
@@ -86,7 +87,7 @@ const BuildCheckPersonalDetails = (props) => {
                     <dd className="govuk-summary-list__actions">
                         <a
                             className="govuk-link"
-                            href="#"
+                            href="#emailaddress1"
                             onClick={() => {
                                 setPersonalDetailsComplete(false);
                             }}
@@ -110,7 +111,7 @@ const BuildCheckPersonalDetails = (props) => {
                     <dd className="govuk-summary-list__actions">
                         <a
                             className="govuk-link"
-                            href="#"
+                            href="#telephone1"
                             onClick={() => {
                                 setPersonalDetailsComplete(false);
                             }}
@@ -133,7 +134,7 @@ const BuildCheckPersonalDetails = (props) => {
                     <dd className="govuk-summary-list__actions">
                         <a
                             className="govuk-link"
-                            href="#"
+                            href="#company"
                             onClick={() => {
                                 setPersonalDetailsComplete(false);
                             }}
@@ -161,7 +162,7 @@ const BuildCheckPersonalDetails = (props) => {
                     <dd className="govuk-summary-list__actions">
                         <a
                             className="govuk-link"
-                            href="#"
+                            href="#address1_line1"
                             onClick={() => {
                                 setPersonalDetailsComplete(false);
                             }}
@@ -185,7 +186,7 @@ const BuildCheckPersonalDetails = (props) => {
                     <dd className="govuk-summary-list__actions">
                         <a
                             className="govuk-link"
-                            href="#"
+                            href="#address1_line2"
                             onClick={() => {
                                 setPersonalDetailsComplete(false);
                             }}
@@ -209,7 +210,7 @@ const BuildCheckPersonalDetails = (props) => {
                     <dd className="govuk-summary-list__actions">
                         <a
                             className="govuk-link"
-                            href="#"
+                            href="#address1_city"
                             onClick={() => {
                                 setPersonalDetailsComplete(false);
                             }}
@@ -233,7 +234,7 @@ const BuildCheckPersonalDetails = (props) => {
                     <dd className="govuk-summary-list__actions">
                         <a
                             className="govuk-link"
-                            href="#"
+                            href="#address1_county"
                             onClick={() => {
                                 setPersonalDetailsComplete(false);
                             }}
@@ -257,7 +258,7 @@ const BuildCheckPersonalDetails = (props) => {
                     <dd className="govuk-summary-list__actions">
                         <a
                             className="govuk-link"
-                            href="#"
+                            href="#address1_postalcode"
                             onClick={() => {
                                 setPersonalDetailsComplete(false);
                             }}
@@ -282,6 +283,11 @@ const BuildCheckPersonalDetails = (props) => {
                 >
                     Continue
                 </button>
+                <Link
+                    href={"/myportal?q=" + props.accountDetails.loggedinUserId}
+                >
+                    <a className="govuk-link">Cancel</a>
+                </Link>
             </div>
         </>
     );
diff --git a/components/breadcrumbs.js b/components/breadcrumbs.js
index c1156aac..44061a11 100644
--- a/components/breadcrumbs.js
+++ b/components/breadcrumbs.js
@@ -366,9 +366,11 @@ const Breadcrumbs = (props) => {
                                 <li className="govuk-breadcrumbs__list-item">
                                     <Link
                                         href={
-                                            router.locale != "en"
+                                            router.locale == "cy"
                                                 ? router.locale + "/myportal"
-                                                : "/myportal"
+                                                : "/myportal?q=" +
+                                                  props.props.accountDetails
+                                                      .loggedinUserId
                                         }
                                     >
                                         <a className="govuk-breadcrumbs__link">
@@ -397,9 +399,11 @@ const Breadcrumbs = (props) => {
                                 <li className="govuk-breadcrumbs__list-item">
                                     <Link
                                         href={
-                                            router.locale != "en"
+                                            router.locale == "cy"
                                                 ? router.locale + "/myportal"
-                                                : "/myportal"
+                                                : "/myportal?q=" +
+                                                  props.props.accountDetails
+                                                      .loggedinUserId
                                         }
                                     >
                                         <a className="govuk-breadcrumbs__link">
diff --git a/components/main.js b/components/main.js
index 5607c6ae..6b5c891e 100644
--- a/components/main.js
+++ b/components/main.js
@@ -28,8 +28,8 @@ export default function Home({ children, pages }) {
                         <CaseSearch />
                         <CaseComment />
                         <Dns />
-                        {/*<Login />
-                           <Inspectorate /> */}
+                        <Login />
+                        {/*   <Inspectorate /> */}
                     </div>
                 </div>
             </div>
diff --git a/pages/account/changepassword.js b/pages/account/changepassword.js
index d4ef41c5..47f5a714 100644
--- a/pages/account/changepassword.js
+++ b/pages/account/changepassword.js
@@ -53,7 +53,7 @@ const Home = (props) => {
                 <div className="govuk-grid-row">
                     <div className="govuk-grid-column-full">
                         <div className="govuk-width-container">
-                            <Breadcrumbs slug={appealtypes} />
+                            <Breadcrumbs slug={appealtypes} props={props} />
                             <main
                                 className="govuk-main-wrapper--auto-spacing"
                                 id="main-content"
@@ -108,6 +108,7 @@ const mapStateToProps = (state) => {
         appealType: state.appealType,
         LPAData: state.LPAData,
         form: state.form,
+        accountDetails: state.accountDetails,
     };
 };
 
diff --git a/pages/account/personaldetails.js b/pages/account/personaldetails.js
index 04645ae1..d856a799 100644
--- a/pages/account/personaldetails.js
+++ b/pages/account/personaldetails.js
@@ -50,7 +50,7 @@ const Home = (props) => {
                 <div className="govuk-grid-row">
                     <div className="govuk-grid-column-full">
                         <div className="govuk-width-container">
-                            <Breadcrumbs slug={appealtypes} />
+                            <Breadcrumbs slug={appealtypes} props={props} />
                             <main
                                 className="govuk-main-wrapper--auto-spacing"
                                 id="main-content"
diff --git a/pages/myportal/index.js b/pages/myportal/index.js
index 96072b93..4f6fc09a 100644
--- a/pages/myportal/index.js
+++ b/pages/myportal/index.js
@@ -16,6 +16,7 @@ import { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
 import data from "../../data/collections.json";
 import nookies from "nookies";
+import { getFormCollectionByID } from "../../components/utils";
 import {
     setLoggedInUserId,
     setAccountDetails,
@@ -222,15 +223,6 @@ export const getServerSideProps = wrapper.getServerSideProps(
     }
 );
 
-const getFormCollection = (formtype) => {
-    const collectionName = jsonpath.query(
-        data,
-        "$..[?(@.LogicalName=='" + formtype + "')].LogicalCollectionName"
-    );
-    //console.log(collectionName[0]);
-    return collectionName[0];
-};
-
 const getDetails = (token, resultsObj) => {
     //console.log(resultsObj);
     let detailsArr = [];
@@ -242,19 +234,12 @@ const getDetails = (token, resultsObj) => {
             detailsArr.push(
                 getPortalModuelDetails(
                     token,
-                    getFormCollection(
-                        "pinswg_" +
-                            searchDetail[
-                                "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
-                            ]
-                                .replace(/(\band|[\s\-\+\(\)\,\&])/g, "")
-                                .toLowerCase()
-                                .slice(0, 39)
-                    ),
+                    getFormCollectionByID(searchDetail.pinswg_appealcasetype),
                     searchDetail.ticketnumber
                 )
             );
         }
+        ß;
     });
     //console.log(detailsArr);
     return Promise.all(detailsArr);