diff --git a/src/main/java/com/knecon/fforesight/tenantusermanagement/service/UserService.java b/src/main/java/com/knecon/fforesight/tenantusermanagement/service/UserService.java
index 0ef49a9..96eb7c6 100644
--- a/src/main/java/com/knecon/fforesight/tenantusermanagement/service/UserService.java
+++ b/src/main/java/com/knecon/fforesight/tenantusermanagement/service/UserService.java
@@ -323,7 +323,7 @@ public class UserService {
 
         var userList = this.getTenantUsersResource().search(username, true);
         if (userList.isEmpty()) {
-            throw new ResponseStatusException(HttpStatus.NOT_FOUND, "User with this username already exists");
+            throw new ResponseStatusException(HttpStatus.CONFLICT, "User with this username already exists");
         }
 
         return convert(userList.iterator().next());
@@ -413,7 +413,7 @@ public class UserService {
         }
 
         if (!EmailValidator.getInstance().isValid(updateProfileRequest.getEmail())) {
-            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Email address format is not valid");
+            throw new ResponseStatusException(HttpStatus.CONFLICT, "Email address format is not valid");
         }
 
         userRepresentation.setFirstName(updateProfileRequest.getFirstName());