diff --git a/files/routes/login.py b/files/routes/login.py
index 5b90f314b..e7dd017c7 100644
--- a/files/routes/login.py
+++ b/files/routes/login.py
@@ -275,7 +275,7 @@ def sign_up_post(v):
 	if email.endswith("@gmail.com"):
 		email=email.split('@')[0]
 		email=email.split('+')[0]
-		email=email.replace('.','')
+		email=email.replace('.','').replace('_','')
 		email=f"{email}@gmail.com"
 
 	if not email: email = None
@@ -383,7 +383,7 @@ def post_forgot():
 	if not user and email.endswith("@gmail.com"):
 		email=email.split('@')[0]
 		email=email.split('+')[0]
-		email=email.replace('.','')
+		email=email.replace('.','').replace('_','')
 		email=f"{email}@gmail.com"
 		user = g.db.query(User).filter(
 			User.username.ilike(username),
@@ -506,7 +506,7 @@ def request_2fa_disable():
 	if email != user.email and email.endswith("@gmail.com"):
 		email=email.split('@')[0]
 		email=email.split('+')[0]
-		email=email.replace('.','')
+		email=email.replace('.','').replace('_','')
 		email=f"{email}@gmail.com"
 		if email != user.email:
 			return render_template("message.html",
diff --git a/files/routes/settings.py b/files/routes/settings.py
index ad8f79ded..e63a2f8d8 100644
--- a/files/routes/settings.py
+++ b/files/routes/settings.py
@@ -591,7 +591,7 @@ def settings_security_post(v):
 		if new_email.endswith("@gmail.com"):
 			new_email=new_email.split('@')[0]
 			new_email=new_email.split('+')[0]
-			new_email=new_email.replace('.','')
+			new_email=new_email.replace('.','').replace('_','')
 			new_email=f"{new_email}@gmail.com"
 
 		if new_email == v.email: