diff --git a/src/Components/TabPanels/Account/TeamPanel.jsx b/src/Components/TabPanels/Account/TeamPanel.jsx
index 950f0ea69..72ff55eee 100644
--- a/src/Components/TabPanels/Account/TeamPanel.jsx
+++ b/src/Components/TabPanels/Account/TeamPanel.jsx
@@ -107,12 +107,13 @@ const TeamPanel = () => {
 
 	const handleChange = (event) => {
 		const { value } = event.target;
+		const newEmail = value?.toLowerCase() || value
 		setToInvite((prev) => ({
 			...prev,
-			email: value,
+			email: newEmail,
 		}));
 
-		const validation = credentials.validate({ email: value }, { abortEarly: false });
+		const validation = credentials.validate({ email: newEmail }, { abortEarly: false });
 
 		setErrors((prev) => {
 			const updatedErrors = { ...prev };
diff --git a/src/Pages/Auth/Login/Login.jsx b/src/Pages/Auth/Login/Login.jsx
index c13218018..9db56ae49 100644
--- a/src/Pages/Auth/Login/Login.jsx
+++ b/src/Pages/Auth/Login/Login.jsx
@@ -63,12 +63,13 @@ const Login = () => {
 	const handleChange = (event) => {
 		const { value, id } = event.target;
 		const name = idMap[id];
+		const lowerCasedValue = name === idMap["login-email-input"]? value?.toLowerCase()||value : value
 		setForm((prev) => ({
 			...prev,
-			[name]: value,
+			[name]: lowerCasedValue,
 		}));
 
-		const { error } = credentials.validate({ [name]: value }, { abortEarly: false });
+		const { error } = credentials.validate({ [name]: lowerCasedValue }, { abortEarly: false });
 
 		setErrors((prev) => {
 			const prevErrors = { ...prev };
diff --git a/src/Pages/Auth/Register/Register.jsx b/src/Pages/Auth/Register/Register.jsx
index afb05435c..118357432 100644
--- a/src/Pages/Auth/Register/Register.jsx
+++ b/src/Pages/Auth/Register/Register.jsx
@@ -259,13 +259,14 @@ const Register = ({ isSuperAdmin }) => {
 	const handleChange = (event) => {
 		const { value, id } = event.target;
 		const name = idMap[id];
+		const lowerCasedValue = name === idMap["register-email-input"]?  value?.toLowerCase() || value : value
 		setForm((prev) => ({
 			...prev,
-			[name]: value,
+			[name]: lowerCasedValue,
 		}));
 
 		const { error } = credentials.validate(
-			{ [name]: value },
+			{ [name]: lowerCasedValue },
 			{ abortEarly: false, context: { password: form.password } }
 		);