diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ef0babd..a5bca22c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 
 ## Unreleased
+### Added
+- Enhance: Navigate user to reset page using force reset during first login [mabhi](https://github.com/mabhi)
+- Upgraded Ory Kratos client to v0.10.1 [akshay196](https://github.com/akshay196)
+
 
 ## [0.1.6]- 2022-12-29
 ### Fixed
diff --git a/package.json b/package.json
index 21563383..cf2e14fe 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
     "@material-ui/core": "^4.9.7",
     "@material-ui/icons": "^4.5.1",
     "@material-ui/lab": "^4.0.0-alpha.56",
-    "@ory/kratos-client": "^0.9.0-alpha.3",
+    "@ory/kratos-client": "0.10.1",
     "@testing-library/jest-dom": "^5.16.2",
     "@testing-library/react": "^12.1.2",
     "@testing-library/user-event": "^13.5.0",
diff --git a/src/actions/Users.js b/src/actions/Users.js
index 26cadd43..a9c334b1 100644
--- a/src/actions/Users.js
+++ b/src/actions/Users.js
@@ -78,6 +78,7 @@ export function getSSOUserDetail(name) {
 
 export function addUser(params) {
   return function (dispatch) {
+    params.spec.forceReset = true;
     http("auth")
       .post("users/", params)
       .then((response) => {
@@ -98,6 +99,7 @@ export function addUserWithCallback(params, onSuccess, onFailure) {
   const organization = JSON.parse(window?.localStorage.getItem("organization"));
   params.metadata.partner = partner;
   params.metadata.organization = organization;
+  params.spec.forceReset = true;
   return function (dispatch) {
     http("auth")
       .post("users", params)
@@ -188,6 +190,18 @@ export function editUser(params) {
   };
 }
 
+export function updateForceReset(successcb, errcb) {
+  http("auth")
+    .put(`user/reset`)
+    .then((editresponse) => {
+      console.log(editresponse);
+      successcb();
+    })
+    .catch((error) => {
+      errcb(error);
+    });
+}
+
 export function updateSSOUser(params) {
   const partner = JSON.parse(window?.localStorage.getItem("partner"));
   const organization = JSON.parse(window?.localStorage.getItem("organization"));
diff --git a/src/appMain/components/Header.js b/src/appMain/components/Header.js
index d707e7ac..3f191934 100644
--- a/src/appMain/components/Header.js
+++ b/src/appMain/components/Header.js
@@ -1,12 +1,18 @@
 import React from "react";
 import AppBar from "@material-ui/core/AppBar";
+import { connect } from "react-redux";
 import Toolbar from "@material-ui/core/Toolbar";
 import UserInfo from "components/UserInfo";
 import ParalusLogo from "assets/images/paralus-logo.png";
 import TopNavBar from "./TopNavBar";
 
-const Header = ({ partnerDetail }) => {
+const Header = ({ partnerDetail, user, userAndRoleDetail }) => {
   let image_src = "";
+  let hasAccess =
+    user === null ||
+    (!!user && !user.spec.forceReset) ||
+    (user.spec.forceReset &&
+      user.metadata.name !== userAndRoleDetail.metadata.name);
   if (partnerDetail) {
     image_src = ParalusLogo;
   }
@@ -17,15 +23,20 @@ const Header = ({ partnerDetail }) => {
   return (
     <AppBar className="app-main-header">
       <Toolbar className="app-toolbar" disableGutters={false}>
-        <div className="text-center" style={{ minWidth: "143px" }}>
-          <a className="app-logo" href="#/">
-            <img src={image_src} alt="" title="" />
-          </a>
-        </div>
-        <div className="ml-4">
-          <TopNavBar />
-        </div>
+        {/* only show the header profile details if user has already set his password */}
+        {hasAccess && (
+          <>
+            <div className="text-center" style={{ minWidth: "143px" }}>
+              <a className="app-logo" href="#/">
+                <img src={image_src} alt="" title="" />
+              </a>
+            </div>
 
+            <div className="ml-4">
+              <TopNavBar />
+            </div>
+          </>
+        )}
         <div className="ml-auto">
           <UserInfo />
         </div>
@@ -34,4 +45,13 @@ const Header = ({ partnerDetail }) => {
   );
 };
 
-export default Header;
+const mapStateToProps = ({ Users, settings }) => {
+  const { user } = Users;
+  const { userAndRoleDetail } = settings;
+  return {
+    user,
+    userAndRoleDetail,
+  };
+};
+
+export default connect(mapStateToProps, null)(Header);
diff --git a/src/appMain/index.js b/src/appMain/index.js
index eda6e7da..4231f832 100755
--- a/src/appMain/index.js
+++ b/src/appMain/index.js
@@ -86,12 +86,19 @@ class AppMain extends React.Component {
       UserSession,
       userLogout,
       organization,
+      userAndRoleDetail,
+      user,
     } = this.props;
     let favicon_src = ParalusMark;
     if (partnerDetail && partnerDetail.fav_icon_link) {
       favicon_src = partnerDetail.fav_icon_link;
     }
     const hasAccess = this.userHasAccess();
+    const forceResetEnabledForUser =
+      user === null ||
+      (!!user && !user.spec.forceReset) ||
+      (user.spec.forceReset &&
+        user.metadata.name !== userAndRoleDetail.metadata.name);
     if (
       !hasAccess &&
       !UserSession.noRolesUser &&
@@ -165,33 +172,43 @@ class AppMain extends React.Component {
               />
             </div>
           )}
-          {hasAccess && currentProject && currentProject.metadata.name && (
-            <main className="app-main-content-wrapper">
-              <div className="app-main-content">
-                <Container maxWidth="lg">
-                  <Route exact path={`${match.url}`} component={Home} />
-                  <Route path={`${match.url}/users`} component={Users} />
-                  <Route path={`${match.url}/settings`} component={Settings} />
-                  <Route path={`${match.url}/tools`} component={Tools} />
-                  <Route path={`${match.url}/audit`} component={AuditLogs} />
-                  <Route path={`${match.url}/projects`} component={Project} />
-                  <Route path={`${match.url}/groups`} component={Group} />
-                  <Route path={`${match.url}/roles`} component={Roles} />
-                  <Route
-                    exact
-                    path={`${match.url}/sso/new`}
-                    component={RegistrationWizard}
-                  />
-                  <Route
-                    exact
-                    path={`${match.url}/sso/update/:ssoId`}
-                    component={RegistrationWizard}
-                  />
-                  <Route exact path={`${match.url}/sso`} component={IdpList} />
-                </Container>
-              </div>
-            </main>
-          )}
+          {hasAccess &&
+            currentProject &&
+            currentProject.metadata.name &&
+            forceResetEnabledForUser && (
+              <main className="app-main-content-wrapper">
+                <div className="app-main-content">
+                  <Container maxWidth="lg">
+                    <Route exact path={`${match.url}`} component={Home} />
+                    <Route path={`${match.url}/users`} component={Users} />
+                    <Route
+                      path={`${match.url}/settings`}
+                      component={Settings}
+                    />
+                    <Route path={`${match.url}/tools`} component={Tools} />
+                    <Route path={`${match.url}/audit`} component={AuditLogs} />
+                    <Route path={`${match.url}/projects`} component={Project} />
+                    <Route path={`${match.url}/groups`} component={Group} />
+                    <Route path={`${match.url}/roles`} component={Roles} />
+                    <Route
+                      exact
+                      path={`${match.url}/sso/new`}
+                      component={RegistrationWizard}
+                    />
+                    <Route
+                      exact
+                      path={`${match.url}/sso/update/:ssoId`}
+                      component={RegistrationWizard}
+                    />
+                    <Route
+                      exact
+                      path={`${match.url}/sso`}
+                      component={IdpList}
+                    />
+                  </Container>
+                </div>
+              </main>
+            )}
           {!this.props.kubectlOpen && <Footer />}
         </div>
         {hasAccess && currentProject?.metadata.name && <MiniKubectl />}
@@ -200,11 +217,19 @@ class AppMain extends React.Component {
   }
 }
 
-const mapStateToProps = ({ settings, Projects, UserSession, Kubectl }) => {
+const mapStateToProps = ({
+  settings,
+  Projects,
+  UserSession,
+  Kubectl,
+  Users,
+}) => {
   const { organization, partnerDetail, reloadApp, userAndRoleDetail } =
     settings;
   const { currentProject } = Projects;
   const kubectlOpen = Kubectl?.open;
+  const { user } = Users;
+
   return {
     partnerDetail,
     currentProject,
@@ -212,6 +237,8 @@ const mapStateToProps = ({ settings, Projects, UserSession, Kubectl }) => {
     organization,
     UserSession,
     kubectlOpen,
+    userAndRoleDetail,
+    user,
   };
 };
 
diff --git a/src/appMain/routes/users/routes/NewUser/components/GridLayout.js b/src/appMain/routes/users/routes/NewUser/components/GridLayout.js
index 7a1e92a2..b5853a4e 100644
--- a/src/appMain/routes/users/routes/NewUser/components/GridLayout.js
+++ b/src/appMain/routes/users/routes/NewUser/components/GridLayout.js
@@ -54,7 +54,7 @@ const GridLayout = ({ leftTitle, rightTitle, leftView, rightView }) => {
           <Grid
             container
             spacing={2}
-            justify="center"
+            justifyContent="center"
             alignItems="stretch"
             className={classes.root}
           >
diff --git a/src/appMain/routes/users/routes/UserDetail/components/Profile.js b/src/appMain/routes/users/routes/UserDetail/components/Profile.js
index a1a9ff38..c915a251 100644
--- a/src/appMain/routes/users/routes/UserDetail/components/Profile.js
+++ b/src/appMain/routes/users/routes/UserDetail/components/Profile.js
@@ -41,7 +41,7 @@ const Profile = ({ user, handleAccountChange }) => {
         <ValidatorForm
           noValidate
           autoComplete="off"
-          // onSubmit={handleAdduser}
+          onSubmit={() => {}}
           onError={(errors) => console.log(errors)}
         >
           <div className="row">
@@ -55,7 +55,7 @@ const Profile = ({ user, handleAccountChange }) => {
                 value={user.metadata.name}
                 label="Email"
                 fullWidth
-                disabled={user.metadata.id}
+                disabled={!!user.metadata.id}
                 validators={["required", "isEmail"]}
                 errorMessages={["this field is required", "email is not valid"]}
               />
diff --git a/src/appMain/routes/users/routes/UsersList/UserList.js b/src/appMain/routes/users/routes/UsersList/UserList.js
index 270d548c..d6f5e39c 100644
--- a/src/appMain/routes/users/routes/UsersList/UserList.js
+++ b/src/appMain/routes/users/routes/UsersList/UserList.js
@@ -186,7 +186,10 @@ class UserList extends React.Component {
     if (props.isAddUserSuccess && props.newUser) {
       this.setState({ open: false });
       this.fetchUsers();
-      this.setState({ newUserOpen: true, newUserName: props.newUser.username });
+      this.setState({
+        newUserOpen: true,
+        newUserName: props.newUser.metadata.name,
+      });
     }
     if (props.isEditUserSuccess) {
       this.fetchUsers();
@@ -440,7 +443,7 @@ class UserList extends React.Component {
         .catch((error) => {
           this.setState({
             showAlert: true,
-            recoveryLink: null,
+            recoveryLink: null, // existing user
             alertMessage: parseError(error) || "Unexpected Error",
             alertSeverity: "error",
           });
@@ -742,22 +745,18 @@ class UserList extends React.Component {
         >
           <DialogContent>
             New user <a style={{ color: "teal" }}>{this.state.newUserName}</a>,
-            has been added successfully. Use the following link to set the
-            password:
+            has been added successfully. Use the following to set the password:
             <br />
             <div className={style.urlCopy}>
-              <a
-                style={{ color: "teal" }}
-                href={this.props.newUser?.recoveryUrl}
-              >
-                {this.props.newUser?.recoveryUrl}
-              </a>
+              <span style={{ color: "teal" }}>
+                {this.props.newUser?.spec.password}
+              </span>
               {copyable && (
                 <Tooltip title={"Copy"} id="clip">
                   <IconButton
                     onClick={() => {
                       navigator.clipboard.writeText(
-                        `${this.props.newUser?.recoveryUrl}`
+                        `${this.props.newUser?.spec.password}`
                       );
                     }}
                     aria-label="copy"
diff --git a/src/components/ProjectList.js b/src/components/ProjectList.js
index cabef829..ff1ce5da 100644
--- a/src/components/ProjectList.js
+++ b/src/components/ProjectList.js
@@ -78,7 +78,7 @@ const ProjectList = ({ roles, handleClick, showExpandedList = false }) => {
       ) : (
         <>
           {projectList?.baseList.map((item, idx) => (
-            <span className={classes.activeLabel}>
+            <span className={classes.activeLabel} key={idx}>
               {item} {idx !== projectList.baseList.length - 1 && ", "}
             </span>
           ))}
diff --git a/src/components/TableComponents/DataTableHead.js b/src/components/TableComponents/DataTableHead.js
index 4ec15569..4bf94e6c 100644
--- a/src/components/TableComponents/DataTableHead.js
+++ b/src/components/TableComponents/DataTableHead.js
@@ -44,9 +44,9 @@ const DataTableHead = ({
           >
             {isSortEnabled && !column.disableSorting ? (
               <TableSortLabel
-                active={orderBy && orderBy === column.id}
+                active={!!orderBy && orderBy === column.id}
                 disabled={column.disableSorting || false}
-                direction={orderBy && orderBy === column.id ? order : "asc"}
+                direction={!!orderBy && orderBy === column.id ? order : "asc"}
                 onClick={createSortHandler(column.id)}
               >
                 {column.label}
diff --git a/src/components/TableComponents/DataTableRow.js b/src/components/TableComponents/DataTableRow.js
index 829e5b4c..553b818f 100644
--- a/src/components/TableComponents/DataTableRow.js
+++ b/src/components/TableComponents/DataTableRow.js
@@ -53,15 +53,19 @@ const DataTableRow = ({ rowIndex, data, parseRowData }) => {
                   if (b.type === "edit-icon") {
                     return (
                       <Tooltip key={i} title="Edit">
-                        <IconButton
-                          key={i}
-                          aria-label="edit"
-                          disabled={b.disabled}
-                          className="m-0"
-                          onClick={b.handleClick}
-                        >
-                          <EditIcon fontSize="small" />
-                        </IconButton>
+                        {b.disabled ? (
+                          <span></span>
+                        ) : (
+                          <IconButton
+                            key={i}
+                            aria-label="edit"
+                            disabled={b.disabled}
+                            className="m-0"
+                            onClick={b.handleClick}
+                          >
+                            <EditIcon fontSize="small" />
+                          </IconButton>
+                        )}
                       </Tooltip>
                     );
                   }
diff --git a/src/components/UserInfo/index.js b/src/components/UserInfo/index.js
index dc8df718..b0ba67d5 100755
--- a/src/components/UserInfo/index.js
+++ b/src/components/UserInfo/index.js
@@ -75,14 +75,18 @@ class UserInfo extends React.Component {
   render() {
     let username = "";
     let isSSOUser = false;
-    const { userAndRoleDetail } = this.props;
+    const { userAndRoleDetail, user } = this.props;
     const { isChangeOrgSuccess, anchorEl, open } = this.state;
     if (userAndRoleDetail) {
       username = userAndRoleDetail.metadata.name;
     } else {
       return null;
     }
-
+    let hasAccess =
+      user === null ||
+      (!!user && !user.spec.forceReset) ||
+      (user.spec.forceReset &&
+        user.metadata.name !== userAndRoleDetail.metadata.name);
     // TODO: This is temporary. Add a flag to indicate usertype RC-6789
     if (
       !`${userAndRoleDetail.spec.firstName}${userAndRoleDetail.spec.lastName}`
@@ -97,56 +101,59 @@ class UserInfo extends React.Component {
 
     return (
       <div className="user-profile d-flex flex-row align-items-center">
-        <div className="user-detail">
-          <h4
-            className="user-name"
-            style={{ textTransform: "none" }}
-            onClick={this.handleClick}
-          >
-            {` ${username} `}
-            <i className="zmdi zmdi-caret-down zmdi-hc-fw align-middle" />
-          </h4>
-          {this.props.organization && this.props.organization.detail && (
-            <small>{this.props.organization.detail.metadata.name}</small>
-          )}
-        </div>
-        <a
-          style={{ color: "#ff9800" }}
-          href={
-            this.props.partnerDetail?.settings?.docs_link?.length > 0
-              ? this.props.partnerDetail.settings.docs_link
-              : "#"
-          }
-        >
-          <HelpOutline style={{ cursor: "pointer", marginLeft: "20px" }} />
-        </a>
-        <Menu
-          className="user-info"
-          id="simple-menu"
-          anchorEl={anchorEl}
-          open={open}
-          onClose={this.handleRequestClose}
-          PaperProps={{
-            style: {
-              width: 200,
-            },
-          }}
-        >
-          <MenuItem
-            style={{ height: "0px" }}
-            className="p-0"
-            onClick={(_) => {}}
-          />
-
-          <MenuItem onClick={this.handleProfileClick}>
-            <i className="zmdi zmdi-account-circle zmdi-hc-fw mr-2" />
-            Profile
-          </MenuItem>
-          <MenuItem onClick={this.handleLogout}>
-            <i className="zmdi zmdi-sign-in zmdi-hc-fw mr-2" />
-            Logout
-          </MenuItem>
-          {/* lang === "english" ?
+        {/* only show the header profile details if user has already set his password */}
+        {hasAccess && (
+          <>
+            <div className="user-detail">
+              <h4
+                className="user-name"
+                style={{ textTransform: "none" }}
+                onClick={this.handleClick}
+              >
+                {` ${username} `}
+                <i className="zmdi zmdi-caret-down zmdi-hc-fw align-middle" />
+              </h4>
+              {this.props.organization && this.props.organization.detail && (
+                <small>{this.props.organization.detail.metadata.name}</small>
+              )}
+            </div>
+            <a
+              style={{ color: "#ff9800" }}
+              href={
+                this.props.partnerDetail?.settings?.docs_link?.length > 0
+                  ? this.props.partnerDetail.settings.docs_link
+                  : "#"
+              }
+            >
+              <HelpOutline style={{ cursor: "pointer", marginLeft: "20px" }} />
+            </a>
+            <Menu
+              className="user-info"
+              id="simple-menu"
+              anchorEl={anchorEl}
+              open={open}
+              onClose={this.handleRequestClose}
+              PaperProps={{
+                style: {
+                  width: 200,
+                },
+              }}
+            >
+              <MenuItem
+                style={{ height: "0px" }}
+                className="p-0"
+                onClick={(_) => {}}
+              />
+
+              <MenuItem onClick={this.handleProfileClick}>
+                <i className="zmdi zmdi-account-circle zmdi-hc-fw mr-2" />
+                Profile
+              </MenuItem>
+              <MenuItem onClick={this.handleLogout}>
+                <i className="zmdi zmdi-sign-in zmdi-hc-fw mr-2" />
+                Logout
+              </MenuItem>
+              {/* lang === "english" ?
           <MenuItem onClick={() => this.handleLang("german")}><i
               className="zmdi zmdi-settings zmdi-hc-fw mr-2" />German
           </MenuItem>
@@ -154,7 +161,9 @@ class UserInfo extends React.Component {
           <MenuItem onClick={() => this.handleLang("english")}><i
               className="zmdi zmdi-settings zmdi-hc-fw mr-2" />English
           </MenuItem> */}
-        </Menu>
+            </Menu>
+          </>
+        )}
         <Profile
           user={userAndRoleDetail}
           onRef={(ref) => {
@@ -166,7 +175,7 @@ class UserInfo extends React.Component {
   }
 }
 
-const mapStateToProps = ({ settings, Projects }) => {
+const mapStateToProps = ({ settings, Projects, Users }) => {
   const {
     account,
     isGetUserDataSuccess,
@@ -180,6 +189,7 @@ const mapStateToProps = ({ settings, Projects }) => {
     partnerDetail,
     organization,
   } = settings;
+  const { user } = Users;
   const { isProjectSet } = Projects;
   return {
     isGetUserDataSuccess,
@@ -194,6 +204,7 @@ const mapStateToProps = ({ settings, Projects }) => {
     partnerDetail,
     organization,
     isProjectSet,
+    user,
   };
 };
 
diff --git a/src/containers/App.js b/src/containers/App.js
index 4add59c1..c26ae6db 100644
--- a/src/containers/App.js
+++ b/src/containers/App.js
@@ -36,6 +36,10 @@ class App extends Component {
   constructor() {
     super();
     this.applyTheme = createTheme(tealTheme);
+    this.state = {
+      userDetailFetched: false,
+      moveToReset: true,
+    };
   }
 
   componentDidMount() {
@@ -47,6 +51,18 @@ class App extends Component {
     T.setTexts(require(`./locale/${lang}.json`));
   }
 
+  componentDidUpdate(prevProps) {
+    const { userAndRoleDetail } = prevProps;
+    if (
+      this.state.moveToReset &&
+      !!userAndRoleDetail &&
+      userAndRoleDetail.spec.forceReset
+    ) {
+      this.setState({ moveToReset: false });
+      window.location = `/ksettings`;
+    }
+  }
+
   render() {
     //This is the starting point for console app, continue to post code from console ..
     const { match, location, isSessionExpired, UserSession } = this.props;
@@ -102,7 +118,7 @@ class App extends Component {
   }
 }
 
-const mapStateToProps = ({ settings, UserSession }) => {
+const mapStateToProps = ({ settings, UserSession, Users }) => {
   const {
     themeColor,
     sideNavColor,
@@ -110,6 +126,7 @@ const mapStateToProps = ({ settings, UserSession }) => {
     partnerDetail,
     organization,
     lang,
+    userAndRoleDetail,
   } = settings;
   return {
     themeColor,
@@ -119,6 +136,7 @@ const mapStateToProps = ({ settings, UserSession }) => {
     UserSession,
     partnerDetail,
     organization,
+    userAndRoleDetail,
   };
 };
 
diff --git a/src/containers/Auth/KratosSettings.js b/src/containers/Auth/KratosSettings.js
index 49762e07..290de20b 100644
--- a/src/containers/Auth/KratosSettings.js
+++ b/src/containers/Auth/KratosSettings.js
@@ -1,7 +1,10 @@
 import React, { useState, useEffect } from "react";
 import { TextValidator, ValidatorForm } from "react-material-ui-form-validator";
+import { useHistory } from "react-router-dom";
+
 import Button from "@material-ui/core/Button";
 import { newKratosSdk } from "actions/Auth";
+import { connect } from "react-redux";
 import { AxiosError } from "axios";
 import T from "i18n-react";
 import { useQuery } from "utils/helpers";
@@ -9,10 +12,12 @@ import PageLayout from "./Login/components/PageLayout";
 import { createTheme, MuiThemeProvider } from "@material-ui/core/styles";
 import tealTheme from "../themes/tealTheme";
 import paraluslogo from "../../assets/images/logolarge.png";
+import { userLogout, updateForceReset } from "actions/index";
 
 const KratosSettings = (props) => {
   const { query } = useQuery();
   const flowid = query.get("flow");
+  const history = useHistory();
 
   // NOTE: flow might be needed on allowing this ui to change other attributes
   const [flow, setFlow] = useState(undefined);
@@ -63,27 +68,52 @@ const KratosSettings = (props) => {
       return;
     }
     newKratosSdk()
-      .submitSelfServiceSettingsFlow(flowid, undefined, {
+      .submitSelfServiceSettingsFlow(flowid ?? flow.id, {
         csrf_token,
         method: "password",
         password: password,
       })
-      .then(({ data }) => {
+      .then(async ({ data }) => {
         if (data.ui.messages) {
-          setMessage("Your password has been reset.");
-          setResetSuccess(true);
+          // flowid is present when the url contains flowid as parameter but for redirects this property is not populated.
+          // e.g. just after deployment installation instruction presents the reset password recovery link with this property as set.
+          if (!!flowid) {
+            setMessage("Your password has been reset.");
+            setResetSuccess(true);
+          } else {
+            // this bock executes for all users, when forceReset is true and users are forced to reset their password instead of using the auto generated password
+            let scb = function () {
+              setMessage("Your password has been reset.");
+              setResetSuccess(true);
+            };
+            await props.updateForceReset(scb, handleError);
+          }
         }
       })
       .catch(async (err) => {
-        if (err.response?.status === 400) {
-          // Yup, it is!
-          if (err.response?.data.ui.nodes) {
-            setMessage(err.response?.data?.ui?.nodes[6].messages[0].text);
-          }
-        }
+        handleError(err);
       });
   };
 
+  const handleError = function (err) {
+    if (err.response?.status === 400) {
+      // Yup, it is!
+      if (err.response?.data.ui.nodes) {
+        setMessage(err.response?.data?.ui?.nodes[6].messages[0].text);
+      }
+      return;
+    } else if (err.response?.status === 403) {
+      // Yup, it is!
+      if (err.response?.data.error?.reason) {
+        setMessage(err.response?.data?.error?.reason);
+      } else {
+        setMessage(err.response?.data?.message);
+      }
+    } else {
+      console.log(err);
+    }
+  };
+
   const handlePasswordChangeAttributes = (event) =>
     setPassword(event.target.value);
 
@@ -167,4 +197,7 @@ const KratosSettings = (props) => {
   );
 };
 
-export default KratosSettings;
+export default connect(null, {
+  userLogout,
+  updateForceReset,
+})(KratosSettings);
diff --git a/src/containers/Auth/Login/index.js b/src/containers/Auth/Login/index.js
index 9026e29a..ab64cb02 100644
--- a/src/containers/Auth/Login/index.js
+++ b/src/containers/Auth/Login/index.js
@@ -233,17 +233,19 @@ class Login extends Component {
     auth.username = username;
 
     newKratosSdk()
-      .submitSelfServiceLoginFlow(flow.id, undefined, {
+      .submitSelfServiceLoginFlow(flow.id, {
         csrf_token: this.state.csrf_token,
         method: "password",
         password_identifier: this.state.username,
         password: this.state.password,
       })
       .then(() => {
-        const { initializeApp } = this.props;
+        // const { initializeApp } = this.props;
+        /*
         initializeApp(() => {
-          window.location.href = "/";
         });
+        */
+        window.location.href = "/";
       })
       .catch((err) => {
         console.log(err);
@@ -258,7 +260,7 @@ class Login extends Component {
 
     window.localStorage.setItem("provider", provider);
     newKratosSdk()
-      .submitSelfServiceLoginFlow(flow.id, undefined, {
+      .submitSelfServiceLoginFlow(flow.id, {
         csrf_token: this.state.csrf_token,
         method: "oidc",
         provider,
diff --git a/src/reducers/Settings.js b/src/reducers/Settings.js
index aa4ac68b..59f38905 100755
--- a/src/reducers/Settings.js
+++ b/src/reducers/Settings.js
@@ -519,7 +519,7 @@ const settings = (state = initialSettings, action) => {
       return {
         ...state,
         isAddUserSuccess: true,
-        newUser: action.payload.data.spec,
+        newUser: action.payload.data,
       };
     case "edit_user_success":
       return {
diff --git a/yarn.lock b/yarn.lock
index 4ef04046..e33bdd8d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1595,10 +1595,10 @@
     mkdirp "^1.0.4"
     rimraf "^3.0.2"
 
-"@ory/kratos-client@^0.9.0-alpha.3":
-  version "0.9.0-alpha.3"
-  resolved "https://registry.npmjs.org/@ory/kratos-client/-/kratos-client-0.9.0-alpha.3.tgz"
-  integrity sha512-AyfNz1P+6G/vS752BqvrRhLYJC1KtukuBUGGQdiMKXJjy+wGTt7Y3wvEIASbD/QyoGEyhIBCYtLbunpVE7VOaA==
+"@ory/kratos-client@0.10.1":
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/@ory/kratos-client/-/kratos-client-0.10.1.tgz#4957233e4ef6e1845e28765d32244ef89e69b93b"
+  integrity sha512-WfoEW1HKeKUkG+57oShb6D3xENM3DpRbUxvVxbPZkJUKzFlXpBzbX71k2oQ6ajv6cy0ULVEKFLNcHpAoGjraNA==
   dependencies:
     axios "^0.21.4"