diff --git a/web/src/beta/features/AccountAndWorkSpaceSetting/index.tsx b/web/src/beta/features/AccountAndWorkSpaceSetting/index.tsx
index 521df33dbc..6c3c0fa114 100644
--- a/web/src/beta/features/AccountAndWorkSpaceSetting/index.tsx
+++ b/web/src/beta/features/AccountAndWorkSpaceSetting/index.tsx
@@ -44,12 +44,7 @@ const AccountAndWorkSpaceSetting: FC<Props> = ({ tab }) => {
 
   return (
     <Wrapper>
-      <Navbar
-        // projectId={projectId}
-        workspaceId={meData.myTeam?.id}
-        // sceneId={sceneId}
-        page="settings"
-      />
+      <Navbar workspaceId={meData.myTeam?.id} page="settings" />
       <MainSection>
         <LeftSidePanel>
           <SidebarWrapper>
@@ -72,7 +67,7 @@ const AccountAndWorkSpaceSetting: FC<Props> = ({ tab }) => {
             <AccountSetting
               onUpdateUserPassword={handleUpdateUserPassword}
               passwordPolicy={passwordPolicy}
-              imformationData={{ name, email }}
+              informationData={{ name, email }}
             />
           )}
         </Content>
diff --git a/web/src/beta/features/AccountAndWorkSpaceSetting/innerPages/AccountSetting/PasswordModal/index.tsx b/web/src/beta/features/AccountAndWorkSpaceSetting/innerPages/AccountSetting/PasswordModal/index.tsx
index 14f3802b60..cb71d1a964 100644
--- a/web/src/beta/features/AccountAndWorkSpaceSetting/innerPages/AccountSetting/PasswordModal/index.tsx
+++ b/web/src/beta/features/AccountAndWorkSpaceSetting/innerPages/AccountSetting/PasswordModal/index.tsx
@@ -22,18 +22,7 @@ export type PasswordPolicy = {
 };
 
 type Props = {
-  className?: string;
-  project?: {
-    id: string;
-    name: string;
-    isArchived: boolean;
-  };
-  workspace?: {
-    id: string;
-    name: string;
-  };
   isVisible: boolean;
-  archiveProject?: (archived: boolean) => void;
   onClose?: () => void;
   passwordPolicy?: PasswordPolicy;
   updatePassword?: ({
@@ -85,7 +74,7 @@ const PasswordModal: React.FC<Props> = ({
           break;
       }
     },
-    [t, password] // eslint-disable-line react-hooks/exhaustive-deps
+    [t, password, passwordPolicy] // eslint-disable-line react-hooks/exhaustive-deps
   );
 
   const handleClose = useCallback(() => {
@@ -171,7 +160,7 @@ const PasswordModal: React.FC<Props> = ({
                   <span>
                     <Icon icon="warning" size="large" color="red" />
                   </span>
-                  "repeatPassword" Passwords need to match.
+                  {t('"repeatPassword" Passwords need to match')}
                 </PasswordMessage>
               ) : undefined}
             </PasswordField>
diff --git a/web/src/beta/features/AccountAndWorkSpaceSetting/innerPages/AccountSetting/index.tsx b/web/src/beta/features/AccountAndWorkSpaceSetting/innerPages/AccountSetting/index.tsx
index f517b5e845..dc07fa66a4 100644
--- a/web/src/beta/features/AccountAndWorkSpaceSetting/innerPages/AccountSetting/index.tsx
+++ b/web/src/beta/features/AccountAndWorkSpaceSetting/innerPages/AccountSetting/index.tsx
@@ -16,8 +16,8 @@ import { InnerPage, SettingsWrapper, SettingsFields } from "../common";
 import PasswordModal from "./PasswordModal";
 
 type Props = {
-  imformationData: { name?: string; email?: string };
-  passwordPolicy: PasswordPolicy;
+  informationData: { name?: string; email?: string };
+  passwordPolicy?: PasswordPolicy;
   onUpdateUserPassword: ({
     password,
     passwordConfirmation
@@ -27,7 +27,7 @@ type Props = {
 const AccountSetting: FC<Props> = ({
   passwordPolicy,
   onUpdateUserPassword,
-  imformationData
+  informationData
 }) => {
   const t = useT();
   const [onPasswordModalClose, setPasswordModalOnClose] =
@@ -40,13 +40,13 @@ const AccountSetting: FC<Props> = ({
           <SettingsFields>
             <InputField
               title={t("Name")}
-              value={imformationData.name ? t(imformationData.name) : ""}
+              value={informationData.name ? t(informationData.name) : ""}
               appearance="readonly"
               disabled
             />
             <InputField
               title={t("Email address")}
-              value={imformationData.email ? t(imformationData.email) : ""}
+              value={informationData.email ? t(informationData.email) : ""}
               appearance="readonly"
               disabled
             />