diff --git a/src/renderer/components/Stack/index.tsx b/src/renderer/components/Stack/index.tsx
index fcc6007f..81a1a4a2 100644
--- a/src/renderer/components/Stack/index.tsx
+++ b/src/renderer/components/Stack/index.tsx
@@ -6,7 +6,7 @@ interface StackProps {
   center?: boolean;
   full?: boolean;
   padding?: boolean;
-  spacing?: 'none' | 'md';
+  spacing?: 'none' | 'sm' | 'md';
 }
 
 export default memo(function Stack({
@@ -23,7 +23,11 @@ export default memo(function Stack({
     vertical ? styles.vertical : undefined,
     full ? styles.full : undefined,
     padding ? styles.padding : undefined,
-    spacing === 'none' ? styles.spaceNone : undefined,
+    spacing === 'none'
+      ? styles.spaceNone
+      : spacing === 'sm'
+      ? styles.spaceSmall
+      : undefined,
   ]
     .filter(Boolean)
     .join(' ');
diff --git a/src/renderer/components/Stack/styles.module.scss b/src/renderer/components/Stack/styles.module.scss
index 09e0f5ce..68299eed 100644
--- a/src/renderer/components/Stack/styles.module.scss
+++ b/src/renderer/components/Stack/styles.module.scss
@@ -23,4 +23,8 @@
 
 .spaceNone {
   gap: 0px;
-}
\ No newline at end of file
+}
+
+.spaceSmall {
+  gap: 10px;
+}
diff --git a/src/renderer/screens/WelcomeScreen/SetupAccountCallout.tsx b/src/renderer/screens/WelcomeScreen/SetupAccountCallout.tsx
index cda68520..65a42a2c 100644
--- a/src/renderer/screens/WelcomeScreen/SetupAccountCallout.tsx
+++ b/src/renderer/screens/WelcomeScreen/SetupAccountCallout.tsx
@@ -9,8 +9,9 @@ import {
 import PasswordField from 'renderer/components/PasswordField';
 import { useCallback, useRef, useState } from 'react';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { faCheckCircle } from '@fortawesome/free-solid-svg-icons';
+import { faCheckCircle, faSpinner } from '@fortawesome/free-solid-svg-icons';
 import LinkButton from 'renderer/components/Button/LinkButton';
+import ButtonGroup from 'renderer/components/ButtonGroup';
 
 function SetupAccountNotLogin() {
   return (
@@ -93,23 +94,25 @@ function SetupAccountNewMasterKey({ user }: { user: LoginUser }) {
 
       <SetupMasterPasswordInstruction />
 
-      <PasswordField
-        autoFocus
-        placeholder="Master password"
-        value={password}
-        onChange={setPassword}
-      />
-      <p></p>
-      <PasswordField
-        autoFocus
-        placeholder="Confirm master password"
-        value={confirmed}
-        onChange={setConfirmed}
-      />
-      <p></p>
-      <Button primary onClick={onSetupPassword}>
-        Setup Master Password
-      </Button>
+      <Stack vertical spacing="sm">
+        <PasswordField
+          autoFocus
+          placeholder="Master password"
+          value={password}
+          onChange={setPassword}
+        />
+
+        <PasswordField
+          autoFocus
+          placeholder="Confirm master password"
+          value={confirmed}
+          onChange={setConfirmed}
+        />
+
+        <Button primary onClick={onSetupPassword}>
+          Setup Master Password
+        </Button>
+      </Stack>
     </div>
   );
 }
@@ -153,6 +156,11 @@ function SetupAccountExistingMasterKey({ user }: { user: LoginUser }) {
         placeholder="Master password"
         value={password}
         onChange={setPassword}
+        onKeyDown={(e) => {
+          if (e.key === 'Enter') {
+            onCheckMasterPassword();
+          }
+        }}
       />
       <p></p>
       <Button primary onClick={onCheckMasterPassword}>
@@ -162,7 +170,108 @@ function SetupAccountExistingMasterKey({ user }: { user: LoginUser }) {
   );
 }
 
+function SetupAccountChangePassword({ onClose }: { onClose: () => void }) {
+  const { api, setMasterPassword: setPersistentPassword } = useAuth();
+  const { refetch } = useCurrentUser();
+  const [oldMasterPassword, setOldMasterPassword] = useState('');
+  const [confirmMasterPassword, setConfirmMasterPassword] = useState('');
+  const [masterPassword, setMasterPassword] = useState('');
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState('');
+
+  const onChangePassword = useCallback(() => {
+    if (!masterPassword) {
+      setError('Please enter valid master password.');
+      return;
+    }
+
+    if (confirmMasterPassword !== masterPassword) {
+      setError('The password is not matched');
+      return;
+    }
+
+    setLoading(true);
+    api
+      .updateMasterPassword(masterPassword, oldMasterPassword)
+      .then((resp) => {
+        if (resp.status) {
+          setPersistentPassword(masterPassword);
+          refetch();
+          onClose();
+        } else {
+          setError(resp.error?.message ?? '');
+        }
+        setLoading(false);
+      })
+      .catch(() => setLoading(false));
+  }, [
+    setPersistentPassword,
+    oldMasterPassword,
+    confirmMasterPassword,
+    onClose,
+    setLoading,
+    refetch,
+  ]);
+
+  return (
+    <div>
+      {error && (
+        <p style={{ color: 'var(--color-critical)' }}>
+          <strong>Error</strong>: {error}
+        </p>
+      )}
+
+      {loading && (
+        <p>
+          <FontAwesomeIcon icon={faSpinner} spin />
+          <span>&nbsp;Changing password...</span>
+        </p>
+      )}
+
+      <Stack vertical spacing="sm">
+        <PasswordField
+          autoFocus
+          placeholder="Old master password"
+          value={oldMasterPassword}
+          onChange={setOldMasterPassword}
+        />
+
+        <PasswordField
+          placeholder="New Master password"
+          value={masterPassword}
+          onChange={setMasterPassword}
+        />
+
+        <PasswordField
+          placeholder="Confirm master password"
+          value={confirmMasterPassword}
+          onChange={setConfirmMasterPassword}
+        />
+
+        <ButtonGroup>
+          <Button primary onClick={onChangePassword} disabled={loading}>
+            Change Password
+          </Button>
+          <Button onClick={onClose}>Cancel</Button>
+        </ButtonGroup>
+      </Stack>
+    </div>
+  );
+}
+
 function SetupAccountComplete({ user }: { user: LoginUser }) {
+  const [showChangePassword, setShowChangePassword] = useState(false);
+
+  if (showChangePassword) {
+    return (
+      <SetupAccountChangePassword
+        onClose={() => {
+          setShowChangePassword(false);
+        }}
+      />
+    );
+  }
+
   return (
     <Stack>
       <div>
@@ -175,6 +284,15 @@ function SetupAccountComplete({ user }: { user: LoginUser }) {
       <div>
         <h2 style={{ marginBottom: '0.5rem' }}>Welcome, {user.name}</h2>
         <p>Your account is secured with your master password.</p>
+
+        <ul>
+          <li>
+            <LinkButton
+              text="Change new master password"
+              onClick={() => setShowChangePassword(true)}
+            />
+          </li>
+        </ul>
       </div>
     </Stack>
   );
diff --git a/src/renderer/screens/WelcomeScreen/styles.module.scss b/src/renderer/screens/WelcomeScreen/styles.module.scss
index c552e055..aa5ad541 100644
--- a/src/renderer/screens/WelcomeScreen/styles.module.scss
+++ b/src/renderer/screens/WelcomeScreen/styles.module.scss
@@ -1,6 +1,11 @@
 .calloutBackground {
-  background-color: #4158D0;
-  background-image: linear-gradient(43deg, #4158D0 0%, #C850C0 46%, #FFCC70 100%);
+  background-color: #4158d0;
+  background-image: linear-gradient(
+    43deg,
+    #4158d0 0%,
+    #c850c0 46%,
+    #ffcc70 100%
+  );
   padding: 40px;
 }
 
@@ -61,4 +66,5 @@
 .footer {
   border-top: 1px solid var(--color-border);
   padding-top: 10px;
+  margin-top: 10px;
 }
diff --git a/src/renderer/utils/RemoteAPI.ts b/src/renderer/utils/RemoteAPI.ts
index cdfd655a..fa4bf49d 100644
--- a/src/renderer/utils/RemoteAPI.ts
+++ b/src/renderer/utils/RemoteAPI.ts
@@ -34,9 +34,14 @@ export default class RemoteAPI {
     oldMasterPassword?: string,
   ) {
     return (
-      await this.client.post('/v1/user/master_key', {
+      await this.client.post<{
+        status: boolean;
+        error?: {
+          message?: string;
+        };
+      }>('/v1/user/master_key', {
         masterkey: newMasterPassword,
-        oldMasterPassword: oldMasterPassword,
+        old_masterkey: oldMasterPassword,
       })
     ).data;
   }