diff --git a/src/components/PasswordForm.tsx b/src/components/PasswordForm.tsx
index 6870d3886..406d1fc46 100644
--- a/src/components/PasswordForm.tsx
+++ b/src/components/PasswordForm.tsx
@@ -12,6 +12,7 @@ import { Spinner } from 'react-bootstrap';
 interface Props {
     callback: (passphrase: any, setFieldError: any) => Promise<void>;
     buttonText: string;
+    back: () => void;
 }
 interface formValues {
     passphrase: string;
@@ -122,6 +123,11 @@ function SetPassword(props: Props) {
                             </Form>
                         )}
                     </Formik>
+                    <div className="text-center" style={{ marginTop: '20px' }}>
+                        <Button variant="link" onClick={props.back}>
+                            {constants.GO_BACK}
+                        </Button>
+                    </div>
                 </Card.Body>
             </Card>
         </Container>
diff --git a/src/pages/changePassword/index.tsx b/src/pages/changePassword/index.tsx
index bf5fd689a..d1474f84c 100644
--- a/src/pages/changePassword/index.tsx
+++ b/src/pages/changePassword/index.tsx
@@ -73,7 +73,7 @@ export default function Generate() {
         <PasswordForm
             callback={onSubmit}
             buttonText={constants.CHANGE_PASSWORD}
-            cancel={() => router.push('/gallery')}
+            back={() => router.push('/gallery')}
         />
     );
 }
diff --git a/src/pages/generate/index.tsx b/src/pages/generate/index.tsx
index f71aefa67..98925bab1 100644
--- a/src/pages/generate/index.tsx
+++ b/src/pages/generate/index.tsx
@@ -88,7 +88,7 @@ export default function Generate() {
             <PasswordForm
                 callback={onSubmit}
                 buttonText={constants.SET_PASSPHRASE}
-                cancel={logoutUser}
+                back={logoutUser}
             />
         </>
     );
diff --git a/src/utils/strings/englishConstants.tsx b/src/utils/strings/englishConstants.tsx
index 47342e1d3..c39d62a8a 100644
--- a/src/utils/strings/englishConstants.tsx
+++ b/src/utils/strings/englishConstants.tsx
@@ -161,6 +161,7 @@ const englishConstants = {
         'failed to sync with remote server, please refresh page to try again',
     PASSWORD_GENERATION_FAILED: `your browser was unable to generate a strong enough password  that meets ente's encryption standards, please try using the mobile app or another browser`,
     CHANGE_PASSWORD: 'change password',
+    GO_BACK: 'go back',
 };
 
 export default englishConstants;