diff --git a/app/api/users/[userId]/route.ts b/app/api/users/[userId]/route.ts
index a22933fc..24392473 100644
--- a/app/api/users/[userId]/route.ts
+++ b/app/api/users/[userId]/route.ts
@@ -32,7 +32,7 @@ async function deleteLeantimeUser(email: string): Promise<{ success: boolean; er
     }
 
     // Find the user with matching email
-    const user = getUsersData.result.find((u: any) => u.email === email);
+    const user = getUsersData.result.find((u: any) => u.username === email);
     if (!user) {
       console.log('User not found in Leantime, might have been already deleted');
       return { success: true }; // Consider it a success if user doesn't exist
diff --git a/app/api/users/route.ts b/app/api/users/route.ts
index 9a281a35..2b53bc28 100644
--- a/app/api/users/route.ts
+++ b/app/api/users/route.ts
@@ -202,7 +202,6 @@ function validateUsername(username: string): { isValid: boolean; error?: string
 
 // Helper function to create user in Leantime
 async function createLeantimeUser(userData: {
-  username: string;
   firstName: string;
   lastName: string;
   email: string;
@@ -230,7 +229,7 @@ async function createLeantimeUser(userData: {
         jsonrpc: '2.0',
         id: 1,
         params: {
-          values: {
+          user: {
             firstname: userData.firstName,
             lastname: userData.lastName,
             email: userData.email,
@@ -444,7 +443,6 @@ export async function POST(req: Request) {
 
     // Create user in Leantime
     const leantimeResult = await createLeantimeUser({
-      username: data.username,
       firstName: data.firstName,
       lastName: data.lastName,
       email: data.email,