diff --git a/src/lib/page_loading_indicator.svelte b/src/lib/page_loading_indicator.svelte
index 7b1f203..592f7a2 100644
--- a/src/lib/page_loading_indicator.svelte
+++ b/src/lib/page_loading_indicator.svelte
@@ -34,7 +34,7 @@
 </script>
 
 <div class="progress" class:visible style:--progress={progress}>
-	<div class="track"></div>
+	<div class="track" />
 </div>
 
 <style lang="postcss">
diff --git a/src/lib/server/api/controllers/iam.controller.ts b/src/lib/server/api/controllers/iam.controller.ts
index bf60910..a830e3b 100644
--- a/src/lib/server/api/controllers/iam.controller.ts
+++ b/src/lib/server/api/controllers/iam.controller.ts
@@ -28,14 +28,15 @@ export class IamController implements Controller {
 			})
 			.post('/update/profile', requireAuth, zValidator('json', updateProfileDto), limiter({ limit: 10, minutes: 60 }), async (c) => {
 				const user = c.var.user;
+				console.log('user id', user.id);
 				const { firstName, lastName, username } = c.req.valid('json');
-				await this.iamService.updateProfile(user.id, { first_name: firstName, last_name: lastName, username });
+				const updatedUser = await this.iamService.updateProfile(user.id, { firstName, lastName, username });
 				return c.json({ status: 'success' });
 			})
 			.post('/update/email', requireAuth, zValidator('json', updateEmailDto), limiter({ limit: 10, minutes: 60 }), async (c) => {
 				const user = c.var.user;
 				const { email } = c.req.valid('json');
-				await this.iamService.updateEmail(user.id, email);
+				await this.iamService.updateEmail(user.id, { email });
 				return c.json({ status: 'success' });
 			})
 			.post('/logout', requireAuth, async (c) => {
diff --git a/src/lib/server/api/repositories/wishlists.repository.ts b/src/lib/server/api/repositories/wishlists.repository.ts
index a566d06..ffa0c95 100644
--- a/src/lib/server/api/repositories/wishlists.repository.ts
+++ b/src/lib/server/api/repositories/wishlists.repository.ts
@@ -9,7 +9,7 @@ export type UpdateWishlist = Partial<CreateWishlist>;
 
 @injectable()
 export class WishlistsRepository {
-	constructor(@inject(DatabaseProvider) private readonly db: DatabaseProvider) { }
+	constructor(@inject(DatabaseProvider) private readonly db: DatabaseProvider){ }
 
 	async findAll() {
 		return this.db.query.wishlists.findMany();
diff --git a/src/lib/server/api/services/iam.service.ts b/src/lib/server/api/services/iam.service.ts
index e3a33c2..0c37952 100644
--- a/src/lib/server/api/services/iam.service.ts
+++ b/src/lib/server/api/services/iam.service.ts
@@ -33,10 +33,24 @@ export class IamService {
 	}
 
 	async updateProfile(userId: string, data: UpdateProfileDto) {
+		const user = await this.usersService.findOneById(userId);
+		if (!user) {
+			return {
+				error: 'User not found'
+			};
+		}
+
+		const existingUserForNewUsername = await this.usersService.findOneByUsername(data.username);
+		if (existingUserForNewUsername && existingUserForNewUsername.id !== userId) {
+			return {
+				error: 'Username already in use'
+			};
+		}
+
 		return this.usersService.updateUser(userId, {
 			first_name: data.firstName,
 			last_name: data.lastName,
-			username: data.username
+			username: data.username !== user.username ? data.username : user.username
 		});
 	}