diff --git a/backend/src/services/user/user-service.ts b/backend/src/services/user/user-service.ts
index aae32d91f..39300fec5 100644
--- a/backend/src/services/user/user-service.ts
+++ b/backend/src/services/user/user-service.ts
@@ -107,7 +107,8 @@ export const userServiceFactory = ({
     });
 
     await userDAL.updateById(user.id, {
-      isEmailVerified: true
+      isEmailVerified: true,
+      username: usersByusername.length === 1 && user.email ? user.email.toLowerCase() : undefined
     });
   };