diff --git a/packages/template-retail-react-app/app/components/passwordless-login/index.jsx b/packages/template-retail-react-app/app/components/passwordless-login/index.jsx
index 503974752f..602f1554d7 100644
--- a/packages/template-retail-react-app/app/components/passwordless-login/index.jsx
+++ b/packages/template-retail-react-app/app/components/passwordless-login/index.jsx
@@ -85,6 +85,7 @@ const PasswordlessLogin = ({
                     <StandardLogin
                         form={form}
                         handleForgotPasswordClick={handleForgotPasswordClick}
+                        setShowPasswordView={setShowPasswordView}
                         hideEmail={true}
                     />
                 )}
diff --git a/packages/template-retail-react-app/app/components/standard-login/index.jsx b/packages/template-retail-react-app/app/components/standard-login/index.jsx
index abee801bf3..32a688316b 100644
--- a/packages/template-retail-react-app/app/components/standard-login/index.jsx
+++ b/packages/template-retail-react-app/app/components/standard-login/index.jsx
@@ -17,6 +17,7 @@ const StandardLogin = ({
     handleForgotPasswordClick,
     hideEmail = false,
     isSocialEnabled = false,
+    setShowPasswordView,
     idps = []
 }) => {
     return (
@@ -28,7 +29,7 @@ const StandardLogin = ({
                     handleForgotPasswordClick={handleForgotPasswordClick}
                 />
             </Stack>
-            <Stack spacing={6}>
+            <Stack spacing={4}>
                 <Button
                     type="submit"
                     onClick={() => {
@@ -40,16 +41,31 @@ const StandardLogin = ({
                 </Button>
                 {isSocialEnabled && idps.length > 0 && (
                     <>
-                        <Divider />
-                        <Text align="center" fontSize="sm">
-                            <FormattedMessage
-                                defaultMessage="Or Login With"
-                                id="login_form.message.or_login_with"
-                            />
-                        </Text>
+                        <Stack spacing={6} paddingTop={2} paddingBottom={2}>
+                            <Divider />
+                            <Text align="center" fontSize="sm">
+                                <FormattedMessage
+                                    defaultMessage="Or Login With"
+                                    id="login_form.message.or_login_with"
+                                />
+                            </Text>
+                        </Stack>
                         <SocialLogin form={form} idps={idps} />
                     </>
                 )}
+                {hideEmail && (
+                    <Button
+                        onClick={() => setShowPasswordView(false)}
+                        borderColor="gray.500"
+                        color="blue.600"
+                        variant="outline"
+                    >
+                        <FormattedMessage
+                            defaultMessage="Back to Sign In Options"
+                            id="login_form.button.back"
+                        />
+                    </Button>
+                )}
             </Stack>
         </Stack>
     )
@@ -60,6 +76,7 @@ StandardLogin.propTypes = {
     handleForgotPasswordClick: PropTypes.func,
     hideEmail: PropTypes.bool,
     isSocialEnabled: PropTypes.bool,
+    setShowPasswordView: PropTypes.func,
     idps: PropTypes.arrayOf(PropTypes.string)
 }
 
diff --git a/packages/template-retail-react-app/app/components/standard-login/index.test.js b/packages/template-retail-react-app/app/components/standard-login/index.test.js
index 5442052fd1..be99d2e105 100644
--- a/packages/template-retail-react-app/app/components/standard-login/index.test.js
+++ b/packages/template-retail-react-app/app/components/standard-login/index.test.js
@@ -33,6 +33,7 @@ describe('StandardLogin component', () => {
 
         expect(screen.queryByLabelText('Email')).not.toBeInTheDocument()
         expect(screen.getByLabelText('Password')).toBeInTheDocument()
+        expect(screen.getByRole('button', {name: 'Back to Sign In Options'})).toBeInTheDocument()
     })
 
     test('renders social login buttons', async () => {
diff --git a/packages/template-retail-react-app/app/static/translations/compiled/en-GB.json b/packages/template-retail-react-app/app/static/translations/compiled/en-GB.json
index 5aedd06f49..9ba48e3c57 100644
--- a/packages/template-retail-react-app/app/static/translations/compiled/en-GB.json
+++ b/packages/template-retail-react-app/app/static/translations/compiled/en-GB.json
@@ -2233,6 +2233,12 @@
       "value": "Apple"
     }
   ],
+  "login_form.button.back": [
+    {
+      "type": 0,
+      "value": "Back to Sign In Options"
+    }
+  ],
   "login_form.button.continue_securely": [
     {
       "type": 0,
diff --git a/packages/template-retail-react-app/app/static/translations/compiled/en-US.json b/packages/template-retail-react-app/app/static/translations/compiled/en-US.json
index 5aedd06f49..9ba48e3c57 100644
--- a/packages/template-retail-react-app/app/static/translations/compiled/en-US.json
+++ b/packages/template-retail-react-app/app/static/translations/compiled/en-US.json
@@ -2233,6 +2233,12 @@
       "value": "Apple"
     }
   ],
+  "login_form.button.back": [
+    {
+      "type": 0,
+      "value": "Back to Sign In Options"
+    }
+  ],
   "login_form.button.continue_securely": [
     {
       "type": 0,
diff --git a/packages/template-retail-react-app/app/static/translations/compiled/en-XA.json b/packages/template-retail-react-app/app/static/translations/compiled/en-XA.json
index d89e33bb53..f483d4026a 100644
--- a/packages/template-retail-react-app/app/static/translations/compiled/en-XA.json
+++ b/packages/template-retail-react-app/app/static/translations/compiled/en-XA.json
@@ -4761,6 +4761,20 @@
       "value": "]"
     }
   ],
+  "login_form.button.back": [
+    {
+      "type": 0,
+      "value": "["
+    },
+    {
+      "type": 0,
+      "value": "Ɓȧȧƈķ ŧǿǿ Şīɠƞ Īƞ Ǿƥŧīǿǿƞş"
+    },
+    {
+      "type": 0,
+      "value": "]"
+    }
+  ],
   "login_form.button.continue_securely": [
     {
       "type": 0,
diff --git a/packages/template-retail-react-app/translations/en-GB.json b/packages/template-retail-react-app/translations/en-GB.json
index b1424c800d..f410bef930 100644
--- a/packages/template-retail-react-app/translations/en-GB.json
+++ b/packages/template-retail-react-app/translations/en-GB.json
@@ -954,6 +954,9 @@
   "login_form.button.apple": {
     "defaultMessage": "Apple"
   },
+  "login_form.button.back": {
+    "defaultMessage": "Back to Sign In Options"
+  },
   "login_form.button.continue_securely": {
     "defaultMessage": "Continue Securely"
   },
diff --git a/packages/template-retail-react-app/translations/en-US.json b/packages/template-retail-react-app/translations/en-US.json
index b1424c800d..f410bef930 100644
--- a/packages/template-retail-react-app/translations/en-US.json
+++ b/packages/template-retail-react-app/translations/en-US.json
@@ -954,6 +954,9 @@
   "login_form.button.apple": {
     "defaultMessage": "Apple"
   },
+  "login_form.button.back": {
+    "defaultMessage": "Back to Sign In Options"
+  },
   "login_form.button.continue_securely": {
     "defaultMessage": "Continue Securely"
   },