diff --git a/apps/event-system/services/users/users.service.ts b/apps/event-system/services/users/users.service.ts
index 649b90e..0e4e2c3 100644
--- a/apps/event-system/services/users/users.service.ts
+++ b/apps/event-system/services/users/users.service.ts
@@ -9,6 +9,8 @@ import axios from 'axios';
 import { get, omit, pick, uniqBy } from 'lodash';
 import DbService from 'moleculer-db';
 import MongoDBAdapter from 'moleculer-db-adapter-mongo';
+import { v4 as uuidv4 } from 'uuid';
+
 
 const Auth = require('@libs-private/service-logic/mixins/auth');
 
@@ -429,8 +431,7 @@ module.exports = {
               verified: get(user, 'verified_email', false)
             }];
 
-            // Google doesn't provide username, so we'll create one from email.
-            const username = email.split('@')[0];
+            const username = `${email.split('@')[0]}-${uuidv4().replace(/-/g, '').substring(0, 16)}`;
 
             // Google provides given_name and family_name directly
             const firstName = get(user, 'given_name', '');
@@ -587,7 +588,7 @@ module.exports = {
                 )
               : null;
 
-            const username = get(user, 'login');
+            const username = `${get(user, 'login')}-${uuidv4().replace(/-/g, '').substring(0, 16)}`;
 
             const [firstName, lastName] = getFirstAndLastNameFromName(
               get(user, 'name')
@@ -695,7 +696,7 @@ module.exports = {
               },
             ];
 
-            const username = get(user, 'username');
+            const username = `${get(user, 'username')}-${uuidv4().replace(/-/g, '').substring(0, 16)}`;
 
             const [firstName, lastName] = getFirstAndLastNameFromName(
               get(user, 'name')