diff --git a/backend/src/ee/routes/v1/scim-router.ts b/backend/src/ee/routes/v1/scim-router.ts
index 5fa0d19e8..52e4f8e1f 100644
--- a/backend/src/ee/routes/v1/scim-router.ts
+++ b/backend/src/ee/routes/v1/scim-router.ts
@@ -270,7 +270,6 @@ export const registerScimRouter = async (server: FastifyZodProvider) => {
       }),
       body: z.object({
         schemas: z.array(z.string()),
-        id: z.string().trim(),
         userName: z.string().trim(),
         name: z
           .object({
@@ -278,7 +277,6 @@ export const registerScimRouter = async (server: FastifyZodProvider) => {
             givenName: z.string().trim().optional()
           })
           .optional(),
-        displayName: z.string().trim(),
         emails: z
           .array(
             z.object({
diff --git a/backend/src/services/user/user-service.ts b/backend/src/services/user/user-service.ts
index 39300fec5..0f6ae3bf8 100644
--- a/backend/src/services/user/user-service.ts
+++ b/backend/src/services/user/user-service.ts
@@ -106,9 +106,11 @@ export const userServiceFactory = ({
       code
     });
 
+    const userEmails = user?.email ? await userDAL.find({ email: user.email }) : [];
+
     await userDAL.updateById(user.id, {
       isEmailVerified: true,
-      username: usersByusername.length === 1 && user.email ? user.email.toLowerCase() : undefined
+      username: userEmails?.length === 1 && userEmails?.[0]?.id === user.id ? user.email.toLowerCase() : undefined
     });
   };