diff --git a/libs/tup-components/src/auth/LoginComponent/LoginComponent.spec.tsx b/libs/tup-components/src/auth/LoginComponent/LoginComponent.spec.tsx
index 73e608bf6..aa2ba815c 100644
--- a/libs/tup-components/src/auth/LoginComponent/LoginComponent.spec.tsx
+++ b/libs/tup-components/src/auth/LoginComponent/LoginComponent.spec.tsx
@@ -27,7 +27,7 @@ describe('LoginComponent', () => {
       value: { replace: mockNavigate },
     });
     const { getByLabelText, getByRole } = testRender(<LoginComponent />);
-    const username = getByLabelText(/Username/);
+    const username = getByLabelText(/Username or Email/);
     const password = getByLabelText(/Password/);
     const submit = getByRole('button');
     await act(async () => {
diff --git a/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx b/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx
index 8cd02fff0..0db17483c 100644
--- a/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx
+++ b/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx
@@ -155,9 +155,9 @@ const LoginComponent: React.FC<LoginProps> = ({ className }) => {
           <LoginError status={status} isError={isError} />
           <FormikInput
             name="username"
-            label="Username"
+            label="Username or Email"
             type="text"
-            autoComplete="username"
+            autoComplete="username email"
             required
           />
           <FormikInput