diff --git a/src/main/java/com/projecty/projectyweb/chat/ChatController.java b/src/main/java/com/projecty/projectyweb/chat/ChatController.java
index 94f800f..e55f571 100644
--- a/src/main/java/com/projecty/projectyweb/chat/ChatController.java
+++ b/src/main/java/com/projecty/projectyweb/chat/ChatController.java
@@ -5,6 +5,7 @@
 import com.projecty.projectyweb.user.UserService;
 import org.springframework.data.domain.Page;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.server.ResponseStatusException;
 
@@ -23,25 +24,25 @@ public ChatController(ChatService chatService, UserService userService) {
     }
 
     @GetMapping("/{username}")
-    public Page<ChatMessage> getChatMessages(
+    public ResponseEntity<Page<ChatMessage>> getChatMessages(
             @PathVariable("username") String username,
             @RequestParam(required = false, defaultValue = "0") Integer offset,
             @RequestParam(required = false, defaultValue = "10") Integer limit) {
         Optional<User> optionalRecipient = userService.findByByUsername(username);
         if (optionalRecipient.isPresent()) {
             chatService.setAllReadForChat(optionalRecipient.get());
-            return chatService.findByRecipientAndSenderOrderById(optionalRecipient.get(), offset, limit);
+            return new ResponseEntity<>(chatService.findByRecipientAndSenderOrderById(optionalRecipient.get(), offset, limit), HttpStatus.OK);
         }
         throw new ResponseStatusException(HttpStatus.BAD_REQUEST);
     }
 
     @GetMapping("")
-    public List<ChatHistoryData> getChatHistory() {
-        return chatService.getChatHistory();
+    public ResponseEntity<List<ChatHistoryData>> getChatHistory() {
+        return new ResponseEntity<>(chatService.getChatHistory(), HttpStatus.OK);
     }
 
     @GetMapping("unreadChatMessageCount")
-    public int getUnreadChatMessageCount() {
-        return chatService.getUnreadChatMessageCount();
+    public ResponseEntity<Integer> getUnreadChatMessageCount() {
+        return new ResponseEntity<>(chatService.getUnreadChatMessageCount(), HttpStatus.OK);
     }
 }
diff --git a/src/main/java/com/projecty/projectyweb/message/MessageController.java b/src/main/java/com/projecty/projectyweb/message/MessageController.java
index e976a1f..9039015 100644
--- a/src/main/java/com/projecty/projectyweb/message/MessageController.java
+++ b/src/main/java/com/projecty/projectyweb/message/MessageController.java
@@ -37,16 +37,16 @@ public MessageController(UserService userService, MessageRepository messageRepos
     }
 
     @GetMapping
-    public Page<Message> getPageOfMessages(
+    public ResponseEntity<Page<Message>> getPageOfMessages(
             @RequestParam(defaultValue = "ALL") MessageType type,
             @RequestParam(defaultValue = "0") int page,
             @RequestParam(defaultValue = "25") int itemsPerPage
     ) {
-        return messageService.getPageOfMessagesForCurrentUser(type, page, itemsPerPage);
+        return new ResponseEntity<>(messageService.getPageOfMessagesForCurrentUser(type, page, itemsPerPage), HttpStatus.OK);
     }
 
     @PostMapping
-    public Message sendMessagePost(
+    public ResponseEntity<Message> sendMessagePost(
             @RequestParam String recipientUsername,
             @RequestParam String title,
             @RequestParam String text,
@@ -59,7 +59,7 @@ public Message sendMessagePost(
                 .text(text)
                 .recipientUsername(recipientUsername)
                 .build();
-        return messageService.sendMessage(message, multipartFiles);
+        return new ResponseEntity<>(messageService.sendMessage(message, multipartFiles), HttpStatus.OK);
     }
 
     @GetMapping("/{messageId}")
@@ -80,12 +80,12 @@ public ResponseEntity<Message> viewMessage(
     }
 
     @GetMapping("getUnreadMessageCount")
-    public int getUnreadMessageCount() {
-        return messageService.getUnreadMessageCountForCurrentUser();
+    public ResponseEntity<Integer> getUnreadMessageCount() {
+        return new ResponseEntity<>(messageService.getUnreadMessageCountForCurrentUser(), HttpStatus.OK);
     }
 
     @PostMapping("{replyToMessageId}/reply")
-    public Message replyToMessage(
+    public ResponseEntity<Message> replyToMessage(
             @PathVariable Long replyToMessageId,
             @RequestParam String title,
             @RequestParam String text,
@@ -96,7 +96,7 @@ public Message replyToMessage(
                 .title(title)
                 .text(text)
                 .build();
-        return messageService.reply(replyToMessageId, message, multipartFiles);
+        return new ResponseEntity<>(messageService.reply(replyToMessageId, message, multipartFiles), HttpStatus.OK);
     }
 
     @DeleteMapping(value = "{id}")
diff --git a/src/main/java/com/projecty/projectyweb/notifications/NotificationController.java b/src/main/java/com/projecty/projectyweb/notifications/NotificationController.java
index 59f8ddd..82ec2d0 100644
--- a/src/main/java/com/projecty/projectyweb/notifications/NotificationController.java
+++ b/src/main/java/com/projecty/projectyweb/notifications/NotificationController.java
@@ -1,6 +1,7 @@
 package com.projecty.projectyweb.notifications;
 
 import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.server.ResponseStatusException;
 
@@ -21,13 +22,13 @@ public NotificationController(NotificationService notificationService, Notificat
     }
 
     @GetMapping
-    public List<Notification> getNotifications() {
-        return notificationService.getNotifications();
+    public ResponseEntity<List<Notification>> getNotifications() {
+        return new ResponseEntity<>(notificationService.getNotifications(), HttpStatus.OK);
     }
 
     @GetMapping("unseenCount")
-    public Long getUnseenNotificationsCount() {
-        return notificationService.getUnseenNotificationCount();
+    public ResponseEntity<Long> getUnseenNotificationsCount() {
+        return new ResponseEntity<>(notificationService.getUnseenNotificationCount(), HttpStatus.OK);
     }
 
     @DeleteMapping("{id}")
diff --git a/src/main/java/com/projecty/projectyweb/project/ProjectController.java b/src/main/java/com/projecty/projectyweb/project/ProjectController.java
index 446fd54..1f19150 100644
--- a/src/main/java/com/projecty/projectyweb/project/ProjectController.java
+++ b/src/main/java/com/projecty/projectyweb/project/ProjectController.java
@@ -9,6 +9,7 @@
 import com.projecty.projectyweb.project.role.dto.ProjectRoleData;
 import com.projecty.projectyweb.user.UserService;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.validation.BindException;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
@@ -42,12 +43,12 @@ public ProjectController(ProjectService projectService, ProjectRepository projec
     }
 
     @GetMapping("")
-    public ProjectsData myProjects() {
-        return projectService.getProjectsForCurrentUser();
+    public ResponseEntity<ProjectsData> myProjects() {
+        return new ResponseEntity<>(projectService.getProjectsForCurrentUser(), HttpStatus.OK);
     }
 
     @PostMapping("")
-    public Project addProjectPost(
+    public ResponseEntity<Project> addProjectPost(
             @Valid @RequestBody Project project,
             BindingResult bindingResult
     ) throws BindException {
@@ -55,7 +56,7 @@ public Project addProjectPost(
         if (bindingResult.hasErrors()) {
             throw new BindException(bindingResult);
         }
-        return projectService.createNewProjectAndSave(project, project.getUsernames());
+        return new ResponseEntity<>(projectService.createNewProjectAndSave(project, project.getUsernames()), HttpStatus.OK);
     }
 
     @DeleteMapping("/{projectId}")
@@ -67,20 +68,20 @@ public void deleteProject(@PathVariable Long projectId) {
 
     @PostMapping("/{projectId}/roles")
     @EditPermission
-    public List<ProjectRole> addUsersToExistingProjectPost(
+    public ResponseEntity<List<ProjectRole>> addUsersToExistingProjectPost(
             @PathVariable Long projectId,
             @RequestBody List<String> usernames) {
         Project project = projectRepository.findById(projectId).get();
-        return projectService.addProjectRolesByUsernames(project, usernames);
+        return new ResponseEntity<>(projectService.addProjectRolesByUsernames(project, usernames), HttpStatus.OK);
     }
 
     @GetMapping(value = "/{projectId}", params = "roles")
     @EditPermission
-    public ProjectData getProjectWithProjectRoles(
+    public ResponseEntity<ProjectData> getProjectWithProjectRoles(
             @PathVariable Long projectId
     ) {
         Optional<Project> optionalProject = projectRepository.findById(projectId);
-        return projectService.getProjectData(optionalProject.get());
+        return new ResponseEntity<>(projectService.getProjectData(optionalProject.get()), HttpStatus.OK);
     }
 
     @PostMapping("/{projectId}/leave")
@@ -91,25 +92,25 @@ public void leaveProject(@PathVariable Long projectId) {
     }
 
     @PatchMapping("/{projectId}")
-    public Project patchProject(
+    public ResponseEntity<Project> patchProject(
             @PathVariable("projectId") Long projectId,
             @RequestBody Project patchedProject
     ) {
         Optional<Project> optionalProject = projectRepository.findById(projectId);
         if (optionalProject.isPresent() && projectService.hasCurrentUserPermissionToEdit(optionalProject.get())) {
-            return projectService.patchProject(optionalProject.get(), patchedProject);
+            return new ResponseEntity<>(projectService.patchProject(optionalProject.get(), patchedProject), HttpStatus.OK);
         } else {
             throw new ResponseStatusException(HttpStatus.NOT_FOUND);
         }
     }
 
     @GetMapping("/{projectId}")
-    public Project getProjectData(
+    public ResponseEntity<Project> getProjectData(
             @PathVariable Long projectId
     ) {
         Optional<Project> optionalProject = projectRepository.findById(projectId);
         if (optionalProject.isPresent() && projectService.hasCurrentUserPermissionToEdit(optionalProject.get())) {
-            return optionalProject.get();
+            return new ResponseEntity<>(optionalProject.get(), HttpStatus.OK);
         } else {
             throw new ResponseStatusException(HttpStatus.NOT_FOUND);
         }
@@ -117,10 +118,10 @@ public Project getProjectData(
 
     @GetMapping("/{projectId}/projectRole")
     @AnyPermission
-    public ProjectRoleData getProjectRoleForCurrentUserByProjectId(@PathVariable Long projectId) {
+    public ResponseEntity<ProjectRoleData> getProjectRoleForCurrentUserByProjectId(@PathVariable Long projectId) {
         ProjectRoleData projectRoleData = projectService.getProjectRoleForCurrentUserByProjectId(projectId);
         if (projectRoleData != null) {
-            return projectRoleData;
+            return new ResponseEntity<>(projectRoleData, HttpStatus.OK);
         }
         throw new ResponseStatusException(HttpStatus.NOT_FOUND);
     }
diff --git a/src/main/java/com/projecty/projectyweb/project/role/ProjectRoleController.java b/src/main/java/com/projecty/projectyweb/project/role/ProjectRoleController.java
index ff67cff..19c69cf 100644
--- a/src/main/java/com/projecty/projectyweb/project/role/ProjectRoleController.java
+++ b/src/main/java/com/projecty/projectyweb/project/role/ProjectRoleController.java
@@ -4,6 +4,7 @@
 import com.projecty.projectyweb.user.User;
 import com.projecty.projectyweb.user.UserService;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.server.ResponseStatusException;
 
@@ -39,14 +40,14 @@ public void deleteUserPost(
 
     @PatchMapping("/{roleId}")
     @EditPermission
-    public ProjectRole changeRolePatch(
+    public ResponseEntity<ProjectRole> changeRolePatch(
             @PathVariable Long roleId,
             @RequestBody ProjectRole patchedProjectRole
     ) {
         Optional<ProjectRole> optionalRole = projectRoleRepository.findById(roleId);
         User current = userService.getCurrentUser();
         if (optionalRole.isPresent() && !optionalRole.get().getUser().equals(current)) {
-            return projectRoleService.patchProjectRole(optionalRole.get(), patchedProjectRole);
+            return new ResponseEntity<>(projectRoleService.patchProjectRole(optionalRole.get(), patchedProjectRole), HttpStatus.OK);
         } else {
             throw new ResponseStatusException(HttpStatus.NOT_FOUND);
         }
diff --git a/src/main/java/com/projecty/projectyweb/settings/SettingsController.java b/src/main/java/com/projecty/projectyweb/settings/SettingsController.java
index a950a52..8961d54 100644
--- a/src/main/java/com/projecty/projectyweb/settings/SettingsController.java
+++ b/src/main/java/com/projecty/projectyweb/settings/SettingsController.java
@@ -1,5 +1,7 @@
 package com.projecty.projectyweb.settings;
 
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
@@ -12,12 +14,12 @@ public SettingsController(SettingsService settingsService) {
     }
 
     @GetMapping
-    public Settings getSettings() {
-        return settingsService.getSettingsForCurrentUser();
+    public ResponseEntity<Settings> getSettings() {
+        return new ResponseEntity<>(settingsService.getSettingsForCurrentUser(), HttpStatus.OK);
     }
 
     @PatchMapping
-    public Settings patchSettings(@RequestBody Settings patchedSettings) {
-        return settingsService.patchSettings(patchedSettings);
+    public ResponseEntity<Settings> patchSettings(@RequestBody Settings patchedSettings) {
+        return new ResponseEntity<>(settingsService.patchSettings(patchedSettings), HttpStatus.OK);
     }
 }
diff --git a/src/main/java/com/projecty/projectyweb/task/TaskController.java b/src/main/java/com/projecty/projectyweb/task/TaskController.java
index 9757418..de6d305 100644
--- a/src/main/java/com/projecty/projectyweb/task/TaskController.java
+++ b/src/main/java/com/projecty/projectyweb/task/TaskController.java
@@ -8,6 +8,7 @@
 import com.projecty.projectyweb.task.dto.TaskData;
 import com.projecty.projectyweb.user.User;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.validation.BindException;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.DataBinder;
@@ -37,7 +38,7 @@ public TaskController(ProjectRepository projectRepository, ProjectService projec
     }
 
     @PostMapping("/project/{projectId}")
-    public Task addTaskPost(
+    public ResponseEntity<Task> addTaskPost(
             @PathVariable Long projectId,
             @RequestBody Task task,
             BindingResult bindingResult
@@ -48,19 +49,19 @@ public Task addTaskPost(
         if (bindingResult.hasErrors()) {
             throw new ResponseStatusException(HttpStatus.BAD_REQUEST);
         } else if (optionalProject.isPresent() && projectService.hasCurrentUserPermissionToEdit(optionalProject.get())) {
-            return taskService.addTaskToProject(task, optionalProject.get());
+            return new ResponseEntity<>(taskService.addTaskToProject(task, optionalProject.get()), HttpStatus.OK);
         } else {
             throw new ResponseStatusException(HttpStatus.NOT_FOUND);
         }
     }
 
     @GetMapping("/project/{projectId}")
-    public ProjectTasksData getProjectTaskData(
+    public ResponseEntity<ProjectTasksData> getProjectTaskData(
             @PathVariable Long projectId
     ) {
         Optional<Project> optionalProject = projectRepository.findById(projectId);
         Project project = optionalProject.get();
-        return taskService.getProjectTasksData(project);
+        return new ResponseEntity<>(taskService.getProjectTasksData(project), HttpStatus.OK);
     }
 
     @DeleteMapping("/{taskId}")
@@ -74,15 +75,15 @@ public void deleteTask(
 
     @GetMapping("/{taskId}")
     @EditPermission
-    public TaskData getTask(
+    public ResponseEntity<TaskData> getTask(
             @PathVariable Long taskId
     ) {
         Optional<Task> optionalTask = taskRepository.findById(taskId);
-        return taskService.getTaskData(optionalTask.get());
+        return new ResponseEntity<>(taskService.getTaskData(optionalTask.get()), HttpStatus.OK);
     }
 
     @PatchMapping("/{taskId}")
-    public Task editTaskDetailsPatch(
+    public ResponseEntity<Task> editTaskDetailsPatch(
             @PathVariable Long taskId,
             @RequestBody Task task
     ) throws BindException {
@@ -96,7 +97,7 @@ public Task editTaskDetailsPatch(
             if (result.hasErrors()) {
                 throw new BindException(result);
             }
-            return taskRepository.save(newTaskCandidate);
+            return new ResponseEntity<>(taskRepository.save(newTaskCandidate), HttpStatus.OK);
         } else {
             throw new ResponseStatusException(HttpStatus.NOT_FOUND);
         }
@@ -104,13 +105,13 @@ public Task editTaskDetailsPatch(
 
     @PostMapping("/{taskId}/assign")
     @EditPermission
-    public User assignUserPost(
+    public ResponseEntity<User> assignUserPost(
             @PathVariable Long taskId,
             @RequestBody String username
     ) {
         Optional<Task> optionalTask = taskRepository.findById(taskId);
         Task task = optionalTask.get();
-        return taskService.assignUserByUsername(task, username);
+        return new ResponseEntity<>(taskService.assignUserByUsername(task, username), HttpStatus.OK);
     }
 
     @DeleteMapping("/{taskId}/assign/{username}")
@@ -124,7 +125,7 @@ public void removeAssignment(
     }
 
     @GetMapping("assigned")
-    public List<Task> getUndoneAssignedTasksForCurrentUser() {
-        return taskService.getUndoneAssignedTasksForCurrentUser();
+    public ResponseEntity<List<Task>> getUndoneAssignedTasksForCurrentUser() {
+        return new ResponseEntity<>(taskService.getUndoneAssignedTasksForCurrentUser(), HttpStatus.OK);
     }
 }
diff --git a/src/main/java/com/projecty/projectyweb/team/TeamController.java b/src/main/java/com/projecty/projectyweb/team/TeamController.java
index 55fd3e2..d7f9b69 100644
--- a/src/main/java/com/projecty/projectyweb/team/TeamController.java
+++ b/src/main/java/com/projecty/projectyweb/team/TeamController.java
@@ -11,6 +11,7 @@
 import com.projecty.projectyweb.user.User;
 import com.projecty.projectyweb.user.UserService;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.validation.BindException;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
@@ -42,7 +43,7 @@ public TeamController(TeamValidator teamValidator, UserService userService, Team
     }
 
     @PostMapping("")
-    public Team addTeam(
+    public ResponseEntity<Team> addTeam(
             @RequestBody Team team,
             BindingResult bindingResult
     ) throws BindException {
@@ -50,32 +51,32 @@ public Team addTeam(
         if (bindingResult.hasErrors()) {
             throw new BindException(bindingResult);
         }
-        return teamService.createTeamAndSave(team, team.getUsernames());
+        return new ResponseEntity<>(teamService.createTeamAndSave(team, team.getUsernames()), HttpStatus.OK);
     }
 
     @GetMapping("")
-    public List<TeamRoleData> myTeams() {
-        return teamService.getTeams();
+    public ResponseEntity<List<TeamRoleData>> myTeams() {
+        return new ResponseEntity<>(teamService.getTeams(), HttpStatus.OK);
     }
 
     @GetMapping(value = "", params = "manager")
-    public List<TeamRole> getTeamRolesWhereManager() {
-        return teamRoleService.getTeamRolesWhereManager(userService.getCurrentUser());
+    public ResponseEntity<List<TeamRole>> getTeamRolesWhereManager() {
+        return new ResponseEntity<>(teamRoleService.getTeamRolesWhereManager(userService.getCurrentUser()), HttpStatus.OK);
     }
 
     @GetMapping("/{teamId}/name")
     @EditPermission
-    public Map<String, String> getTeamName(
+    public ResponseEntity<Map<String, String>> getTeamName(
             @PathVariable Long teamId
     ) {
         Optional<Team> optionalTeam = teamService.findById(teamId);
         Map<String, String> map = new LinkedHashMap<>();
         map.put("name", optionalTeam.get().getName());
-        return map;
+        return new ResponseEntity<>(map, HttpStatus.OK);
     }
 
     @PostMapping("/{teamId}/projects")
-    public Project addProjectToTeamPost(
+    public ResponseEntity<Project> addProjectToTeamPost(
             @Valid @RequestBody Project project,
             @PathVariable Long teamId,
             BindingResult bindingResult
@@ -86,7 +87,7 @@ public Project addProjectToTeamPost(
             throw new BindException(bindingResult);
         }
         if (optionalTeam.isPresent() && teamRoleService.isCurrentUserTeamManager(optionalTeam.get())) {
-            return teamService.createProjectForTeam(optionalTeam.get(), project);
+            return new ResponseEntity<>(teamService.createProjectForTeam(optionalTeam.get(), project), HttpStatus.OK);
         } else {
             throw new ResponseStatusException(HttpStatus.NOT_FOUND);
         }
@@ -94,38 +95,38 @@ public Project addProjectToTeamPost(
 
     @GetMapping(value = "/{teamId}")
     @EditPermission
-    public Team findTeamById(
+    public ResponseEntity<Team> findTeamById(
             @PathVariable Long teamId
     ) {
-        return teamService.findById(teamId).get();
+        return new ResponseEntity<>(teamService.findById(teamId).get(), HttpStatus.OK);
     }
 
     @PatchMapping("/{teamId}")
     @EditPermission
-    public Team patchTeam(
+    public ResponseEntity<Team> patchTeam(
             @PathVariable Long teamId,
             @RequestBody Team team
     ) {
         Optional<Team> optionalTeam = teamService.findById(teamId);
-        return teamService.editTeam(optionalTeam.get(), team);
+        return new ResponseEntity<>(teamService.editTeam(optionalTeam.get(), team), HttpStatus.OK);
     }
 
     @PostMapping("/{teamId}/roles")
     @EditPermission
-    public List<TeamRole> addUsersPost(
+    public ResponseEntity<List<TeamRole>> addUsersPost(
             @PathVariable Long teamId,
             @RequestBody List<String> usernames
     ) {
         Optional<Team> optionalTeam = teamService.findById(teamId);
         Team team = optionalTeam.get();
-        return teamRoleService.addTeamRolesByUsernames(team, usernames);
+        return new ResponseEntity<>(teamRoleService.addTeamRolesByUsernames(team, usernames), HttpStatus.OK);
     }
 
     @GetMapping("/{teamId}/projects")
     @AnyPermission
-    public TeamProjectsData projectList(@PathVariable Long teamId) {
+    public ResponseEntity<TeamProjectsData> projectList(@PathVariable Long teamId) {
         Optional<Team> optionalTeam = teamService.findById(teamId);
-        return teamService.getTeamProjects(optionalTeam.get());
+        return new ResponseEntity<>(teamService.getTeamProjects(optionalTeam.get()), HttpStatus.OK);
     }
 
     @DeleteMapping("/{teamId}")
@@ -145,10 +146,10 @@ public void leaveTeamPost(@PathVariable Long teamId) {
 
     @GetMapping("/{teamId}/teamRole")
     @AnyPermission
-    public TeamRoleData getTeamRoleForCurrentUserByTeamId(@PathVariable Long teamId) {
+    public ResponseEntity<TeamRoleData> getTeamRoleForCurrentUserByTeamId(@PathVariable Long teamId) {
         TeamRoleData teamRoleData = teamService.getTeamRoleForCurrentUserByTeamId(teamId);
         if (teamRoleData != null) {
-            return teamRoleData;
+            return new ResponseEntity<>(teamRoleData, HttpStatus.OK);
         }
         throw new ResponseStatusException(HttpStatus.NOT_FOUND);
     }
diff --git a/src/main/java/com/projecty/projectyweb/team/role/TeamRoleController.java b/src/main/java/com/projecty/projectyweb/team/role/TeamRoleController.java
index f642210..540ff3e 100644
--- a/src/main/java/com/projecty/projectyweb/team/role/TeamRoleController.java
+++ b/src/main/java/com/projecty/projectyweb/team/role/TeamRoleController.java
@@ -3,6 +3,7 @@
 import com.projecty.projectyweb.user.User;
 import com.projecty.projectyweb.user.UserService;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.server.ResponseStatusException;
 
@@ -37,7 +38,7 @@ public void deleteTeamRole(
     }
 
     @PatchMapping("/{teamRoleId}")
-    public TeamRole patchTeamRole(
+    public ResponseEntity<TeamRole> patchTeamRole(
             @PathVariable Long teamRoleId,
             @RequestBody TeamRole patchedValues
     ) {
@@ -46,7 +47,7 @@ public TeamRole patchTeamRole(
         if (optionalTeamRole.isPresent() && teamRoleService.isCurrentUserTeamManager(optionalTeamRole.get().getTeam()) &&
                 !optionalTeamRole.get().getUser().equals(current)
         ) {
-            return teamRoleService.patchTeamRole(optionalTeamRole.get(), patchedValues);
+            return new ResponseEntity<>(teamRoleService.patchTeamRole(optionalTeamRole.get(), patchedValues), HttpStatus.OK);
         } else {
             throw new ResponseStatusException(HttpStatus.NOT_FOUND);
         }
diff --git a/src/main/java/com/projecty/projectyweb/user/UserController.java b/src/main/java/com/projecty/projectyweb/user/UserController.java
index ebb2f7e..487332d 100644
--- a/src/main/java/com/projecty/projectyweb/user/UserController.java
+++ b/src/main/java/com/projecty/projectyweb/user/UserController.java
@@ -3,6 +3,7 @@
 import com.projecty.projectyweb.configurations.AnyPermission;
 import org.apache.commons.io.IOUtils;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.server.ResponseStatusException;
@@ -26,8 +27,8 @@ public UserController(UserService userService,
     }
 
     @GetMapping("auth")
-    public User getUser() {
-        return userService.getCurrentUser();
+    public ResponseEntity<User> getUser() {
+        return new ResponseEntity<>(userService.getCurrentUser(), HttpStatus.OK);
     }
 
     @GetMapping("user/{username}/avatar")
@@ -54,7 +55,7 @@ public void setAvatar(@RequestParam("avatar") MultipartFile multipartFile) throw
     }
 
     @GetMapping("users/usernames")
-    public List<String> getUsernamesStartWith(@RequestParam String usernameStartsWith) {
-        return userService.getUsernamesStartWith(usernameStartsWith);
+    public ResponseEntity<List<String>> getUsernamesStartWith(@RequestParam String usernameStartsWith) {
+        return new ResponseEntity<>(userService.getUsernamesStartWith(usernameStartsWith), HttpStatus.OK);
     }
 }