diff --git a/app/sdms/NOTICE b/app/sdms/NOTICE
index 418b14d455bcd315380f5e8e3b89600cff322d1e..7a89e3123b936c06a175cea44e83dffff0e4e108 100644
--- a/app/sdms/NOTICE
+++ b/app/sdms/NOTICE
@@ -286,7 +286,7 @@ The following software have components provided under the terms of this license:
 - semver (from https://www.npmjs.com/package/semver)
 - semver (from https://www.npmjs.com/package/semver)
 - semver (from https://www.npmjs.com/package/semver)
-- set-blocking (from https://github.com/yargs/set-blocking#readme)
+- set-blocking (from https://www.npmjs.com/package/set-blocking)
 - setprototypeof (from https://www.npmjs.com/package/setprototypeof)
 - signal-exit (from https://www.npmjs.com/package/signal-exit)
 - stealthy-require (from https://www.npmjs.com/package/stealthy-require)
@@ -731,7 +731,7 @@ The following software have components provided under the terms of this license:
 - semver (from https://www.npmjs.com/package/semver)
 - send (from https://www.npmjs.com/package/send)
 - serve-static (from https://www.npmjs.com/package/serve-static)
-- set-blocking (from https://github.com/yargs/set-blocking#readme)
+- set-blocking (from https://www.npmjs.com/package/set-blocking)
 - setprototypeof (from https://www.npmjs.com/package/setprototypeof)
 - signal-exit (from https://www.npmjs.com/package/signal-exit)
 - simple-concat (from https://www.npmjs.com/package/simple-concat)
diff --git a/app/sdms/src/services/user/handler.ts b/app/sdms/src/services/user/handler.ts
index 0bafe711e899bceba3a49c76c408a4d5b88347c7..132a3b8acf9f380db24438fdff43ea7618206ea4 100644
--- a/app/sdms/src/services/user/handler.ts
+++ b/app/sdms/src/services/user/handler.ts
@@ -60,7 +60,6 @@ export class UserHandler {
     private static async addUserToGroups(groups: string[], tenantEsd: string,
         userEmail: string, req: expRequest, role: UserRoles) {
 
-
         await Promise.all(groups.map(async group => {
             try {
                 await AuthGroups.addUserToGroup(
@@ -75,6 +74,8 @@ export class UserHandler {
                 if (e.error && e.error.code === 400) {
                     await AuthGroups.addUserToGroup(req.headers.authorization,
                         group, userEmail, tenantEsd, req[Config.DE_FORWARD_APPKEY], UserRoles.Member);
+                } else if (e.error && e.error.code === 409) {
+                    return; // If the user already exist -> return 200 (making the call idempotent)
                 } else {
                     throw e;
                 }