diff --git a/srcs/requirements/nestjs/api_back/src/chat/chat.service.ts b/srcs/requirements/nestjs/api_back/src/chat/chat.service.ts
index 8313583b..dc314cc2 100644
--- a/srcs/requirements/nestjs/api_back/src/chat/chat.service.ts
+++ b/srcs/requirements/nestjs/api_back/src/chat/chat.service.ts
@@ -146,7 +146,8 @@ export class ChatService {
 		const user_db = await this.getUserByName(username);
 
 		printCaller("-- out ");
-		return user_db.currentRoom;
+		if (user_db)
+			return user_db.currentRoom;
 	}
 
 	async getRoomByName(room_name: string, fieldsToReturn: string[] = null): Promise<Chatroom>
diff --git a/srcs/requirements/nestjs/api_back/src/users/entities/user.entity.ts b/srcs/requirements/nestjs/api_back/src/users/entities/user.entity.ts
index b1f1934c..24a268be 100644
--- a/srcs/requirements/nestjs/api_back/src/users/entities/user.entity.ts
+++ b/srcs/requirements/nestjs/api_back/src/users/entities/user.entity.ts
@@ -43,10 +43,10 @@ export class User {
 	@Column({ nullable: true })
 	secretTwoFactorAuth: string;
 
-	@OneToMany(type => Friendship , (friendship) => friendship.sender, { onDelete: 'CASCADE' })
+	@OneToMany(type => Friendship , (friendship) => friendship.sender, {onDelete: 'CASCADE'})
 	sentFriendRequest: Friendship[];
 
-	@OneToMany(type => Friendship , (friendship) => friendship.receiver, { onDelete: 'CASCADE' })
+	@OneToMany(type => Friendship , (friendship) => friendship.receiver, {onDelete: 'CASCADE'})
 	receivedFriendRequest: Friendship[];
 
 	@JoinColumn()
diff --git a/srcs/requirements/nestjs/api_back/src/users/users.controller.ts b/srcs/requirements/nestjs/api_back/src/users/users.controller.ts
index 163a0d90..a1b91bc3 100644
--- a/srcs/requirements/nestjs/api_back/src/users/users.controller.ts
+++ b/srcs/requirements/nestjs/api_back/src/users/users.controller.ts
@@ -1,5 +1,5 @@
 import {
-	Body, Controller, Delete, Get, NotFoundException,HttpStatus, Param, Patch, Post, Query, Redirect, Req, Res, UploadedFile, UseGuards, UseInterceptors, Next,
+	Body, Controller, Delete, Get, NotFoundException,HttpStatus, Next, Patch, Post, Query, Redirect, Req, Res, UploadedFile, UseGuards, UseInterceptors
 } from '@nestjs/common';
 import { FileInterceptor } from '@nestjs/platform-express';
 import { Response } from 'express';
@@ -73,14 +73,14 @@ export class UsersController {
 	@UseGuards(AuthenticateGuard)
 	@UseGuards(TwoFactorGuard)
 	@Delete()
-	remove(@Req() request, @Res() response, @Next() next) {
-		this.usersService.remove(request.user.id);
-		request.logout(function(err) {
+	remove(@Req() req, @Res() response, @Next() next) {
+		this.usersService.remove(req.user.id);
+		req.logout(function(err) {
 			if (err) { return next(err); }
 			response.redirect('/');
 		  });
-		request.session.cookie.maxAge = 0;
-		return {msg : 'You have deleted your account'};
+		req.session.cookie.maxAge = 0;
+		return {msg : 'Your account has been deleted'};
 	}
 
 
diff --git a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte
index ea6cd16a..eb7e226e 100644
--- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte
+++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte
@@ -125,7 +125,6 @@
 		});
 	}
 
-
 </script>
 
 
@@ -170,7 +169,7 @@
       </form>
     </Card>
   </div>
-	<Button type="primary" on:click={() => deleteAccount()}>Delete Account</Button>
+  <Button type="primary" on:click={() => deleteAccount()}>Delete Account</Button>
 </div>
 </main>