diff --git a/Client/src/Pages/Login/index.jsx b/Client/src/Pages/Login/index.jsx
index 1bf2ad9c9..c67f67ec1 100644
--- a/Client/src/Pages/Login/index.jsx
+++ b/Client/src/Pages/Login/index.jsx
@@ -102,7 +102,7 @@ const Login = () => {
             error={errors.email ? true : false}
             helperText={errors.email ? errors.email : ""}
             placeholder="Enter your email"
-            autoComplete="username"
+            autoComplete="email"
             id="login-email-input"
           />
           <div className="login-form-v2-spacing" />
diff --git a/Client/src/Pages/Register/index.jsx b/Client/src/Pages/Register/index.jsx
index 5f8622e8b..5d08e0c0d 100644
--- a/Client/src/Pages/Register/index.jsx
+++ b/Client/src/Pages/Register/index.jsx
@@ -132,6 +132,7 @@ const Register = () => {
             error={errors.email ? true : false}
             helperText={errors.email ? errors.email : ""}
             placeholder="Enter your email"
+            autoComplete="email"
             id="register-email-input"
           />
           <div className="login-form-v2-spacing" />
@@ -141,6 +142,7 @@ const Register = () => {
             error={errors.password ? true : false}
             helperText={errors.password ? errors.password : ""}
             placeholder="Create a password"
+            autoComplete="current-password"
             id="register-password-input"
           />
         </div>