diff --git a/backend/tasks-projects-service/src/projects/projects.controller.ts b/backend/tasks-projects-service/src/projects/projects.controller.ts
index 088588e..54cb727 100644
--- a/backend/tasks-projects-service/src/projects/projects.controller.ts
+++ b/backend/tasks-projects-service/src/projects/projects.controller.ts
@@ -44,14 +44,15 @@ export class ProjectsController {
     return this.projectsService.findAll();
   }
 
-  @ApiOperation({ summary: 'Get my projects' })
+  @ApiOperation({ summary: 'Get all projects where I participate' })
   @ApiResponse({ status: 200, description: 'List of projects', type: Project, isArray: true })
   @UseGuards(JwtAuthGuard)
   @Get('my')
-  async findMyProjects(@Request() req): Promise<Project[]> {
-    return this.projectsService.findByOwner(req.user.sub);
+  async findUserProjects(@Request() req): Promise<Project[]> {
+      return this.projectsService.findUserProjects(req.user.sub);
   }
 
+
   @ApiOperation({ summary: 'Get single project by ID' })
   @ApiParam({ name: 'id', type: 'number' })
   @ApiResponse({ status: 200, description: 'Found project', type: Project })
diff --git a/backend/tasks-projects-service/src/projects/projects.service.ts b/backend/tasks-projects-service/src/projects/projects.service.ts
index ddd3cfb..f77e26f 100644
--- a/backend/tasks-projects-service/src/projects/projects.service.ts
+++ b/backend/tasks-projects-service/src/projects/projects.service.ts
@@ -29,6 +29,14 @@ export class ProjectsService {
     return this.projectsRepository.find({ where: { ownerId } });
   }
 
+  async findUserProjects(userId: number): Promise<Project[]> {
+    return this.projectsRepository
+        .createQueryBuilder('project')
+        .leftJoin('project_members', 'member', 'member.projectId = project.id')
+        .where('project.ownerId = :userId OR member.userId = :userId', { userId })
+        .getMany();
+  }
+
   async findOneById(id: number): Promise<Project | null> {
     return this.projectsRepository.findOne({ where: { id } });
   }
diff --git a/backend/users-auth-service/src/auth/auth.controller.ts b/backend/users-auth-service/src/auth/auth.controller.ts
index 343688e..67248d5 100644
--- a/backend/users-auth-service/src/auth/auth.controller.ts
+++ b/backend/users-auth-service/src/auth/auth.controller.ts
@@ -46,7 +46,7 @@ export class AuthController {
     description: 'User created successfully',
   })
   @ApiResponse({
-    status: 409,
+    status: 401,
     description: 'Username already exists',
   })
   @Post('register')