diff --git a/apps/dashboard-api/src/controllers/userAuth.controller.js b/apps/dashboard-api/src/controllers/userAuth.controller.js
index c40d51f95..fba2fadcd 100644
--- a/apps/dashboard-api/src/controllers/userAuth.controller.js
+++ b/apps/dashboard-api/src/controllers/userAuth.controller.js
@@ -42,11 +42,17 @@ const buildAuthUserPayload = (usersColConfig, parsedData, hashedPassword, verifi
     }
 
     if (hasRequiredField(usersColConfig, 'name') && (payload.name === undefined || payload.name === null || payload.name === '')) {
-        payload.name = username || email.split('@')[0];
+        const generatedName = username || email.split('@')[0];
+        payload.name = generatedName.length >= 3 ? generatedName : generatedName.padEnd(3, '0');
     }
 
     if (hasRequiredField(usersColConfig, 'username') && (payload.username === undefined || payload.username === null || payload.username === '')) {
-        payload.username = payload.name || email.split('@')[0];
+        const generatedUsernameBase =
+            typeof payload.name === 'string' && payload.name !== ''
+                ? payload.name
+                : email.split('@')[0];
+        const generatedUsername = String(generatedUsernameBase);
+        payload.username = generatedUsername.length >= 3 ? generatedUsername : generatedUsername.padEnd(3, '0');
     }
 
     return payload;
diff --git a/apps/public-api/src/controllers/userAuth.controller.js b/apps/public-api/src/controllers/userAuth.controller.js
index 5236893d3..173e9b6a5 100644
--- a/apps/public-api/src/controllers/userAuth.controller.js
+++ b/apps/public-api/src/controllers/userAuth.controller.js
@@ -42,11 +42,14 @@ const buildAuthUserPayload = (usersColConfig, parsedData, hashedPassword, verifi
     }
 
     if (hasRequiredField(usersColConfig, 'name') && (payload.name === undefined || payload.name === null || payload.name === '')) {
-        payload.name = username || email.split('@')[0];
+        const generatedName = username || email.split('@')[0];
+        payload.name = generatedName.length >= 3 ? generatedName : generatedName.padEnd(3, '0');
     }
 
     if (hasRequiredField(usersColConfig, 'username') && (payload.username === undefined || payload.username === null || payload.username === '')) {
-        payload.username = payload.name || email.split('@')[0];
+        const baseUsername = typeof payload.name === 'string' ? payload.name : email.split('@')[0];
+        const generatedUsername = baseUsername;
+        payload.username = generatedUsername.length >= 3 ? generatedUsername : generatedUsername.padEnd(3, '0');
     }
 
     return payload;