diff --git a/app/api/users/route.ts b/app/api/users/route.ts
index 401a57bd..5903dfb3 100644
--- a/app/api/users/route.ts
+++ b/app/api/users/route.ts
@@ -223,7 +223,7 @@ async function createLeantimeUser(userData: {
         params: {
           values: {
             lastname: userData.lastName,
-            username: userData.email, // Use email as username
+            username: `${userData.firstName} ${userData.lastName}`, // Use FirstName LastName format
             email: userData.email,
             password: userData.password,
             status: 'a', // Use 'a' instead of 'active'