diff --git a/accounts/pkg/service/v0/accounts.go b/accounts/pkg/service/v0/accounts.go
index 090246c9b0..d72b02b323 100644
--- a/accounts/pkg/service/v0/accounts.go
+++ b/accounts/pkg/service/v0/accounts.go
@@ -312,7 +312,7 @@ func (s Service) CreateAccount(ctx context.Context, in *proto.CreateAccountReque
 		return merrors.InternalServerError(s.id, "could not check if account exists: %v", err.Error())
 	}
 	if exists {
-		return merrors.BadRequest(s.id, "account already exists")
+		return merrors.Conflict(s.id, "account already exists")
 	}
 
 	if out.PasswordProfile != nil {
@@ -342,7 +342,7 @@ func (s Service) CreateAccount(ctx context.Context, in *proto.CreateAccountReque
 	indexResults, err := s.index.Add(out)
 	if err != nil {
 		s.rollbackCreateAccount(ctx, out)
-		return merrors.BadRequest(s.id, "Account already exists %v", err.Error())
+		return merrors.Conflict(s.id, "Account already exists %v", err.Error())
 
 	}
 	s.log.Debug().Interface("account", out).Msg("account after indexing")
diff --git a/ocs/pkg/service/v0/users.go b/ocs/pkg/service/v0/users.go
index 6893868917..c25ff6f616 100644
--- a/ocs/pkg/service/v0/users.go
+++ b/ocs/pkg/service/v0/users.go
@@ -184,9 +184,12 @@ func (o Ocs) AddUser(w http.ResponseWriter, r *http.Request) {
 	})
 	if err != nil {
 		merr := merrors.FromError(err)
-		if merr.Code == http.StatusBadRequest {
+		switch merr.Code {
+		case http.StatusBadRequest:
 			render.Render(w, r, response.ErrRender(data.MetaBadRequest.StatusCode, merr.Detail))
-		} else {
+		case http.StatusConflict:
+			render.Render(w, r, response.ErrRender(data.MetaInvalidInput.StatusCode, merr.Detail))
+		default:
 			render.Render(w, r, response.ErrRender(data.MetaServerError.StatusCode, err.Error()))
 		}
 		o.logger.Error().Err(err).Str("userid", userid).Msg("could not add user")