diff --git a/userapi/internal/api.go b/userapi/internal/api.go
index 30723744e..1b34dc7b7 100644
--- a/userapi/internal/api.go
+++ b/userapi/internal/api.go
@@ -46,7 +46,9 @@ func (a *UserInternalAPI) PerformAccountCreation(ctx context.Context, req *api.P
 			case api.ConflictUpdate:
 				break
 			case api.ConflictAbort:
-				return err
+				return &api.ErrorConflict{
+					Message: err.Error(),
+				}
 			}
 		}
 		res.AccountCreated = false