diff --git a/PlanTempus.Components/Users/Create/CreateUserHandler.cs b/PlanTempus.Components/Users/Create/CreateUserHandler.cs
index c4a9764..42bb8dc 100644
--- a/PlanTempus.Components/Users/Create/CreateUserHandler.cs
+++ b/PlanTempus.Components/Users/Create/CreateUserHandler.cs
@@ -14,8 +14,6 @@ namespace PlanTempus.Components.Users.Create
     {
         public async Task<CommandResponse> Handle(CreateUserCommand command)
         {
-            command.TransactionId = Guid.NewGuid();
-
             using var db = databaseOperations.CreateScope(nameof(CreateUserHandler));
             try
             {
@@ -41,7 +39,7 @@ namespace PlanTempus.Components.Users.Create
                 
                 return new CommandResponse(command.CorrelationId, command.GetType().Name, command.TransactionId);
             }
-            catch (PostgresException ex) when (ex.SqlState == "23505")
+            catch (PostgresException ex) when (ex.SqlState == "23505" && ex.ConstraintName.Equals("users_email_key", StringComparison.InvariantCultureIgnoreCase))
             {
                 db.Error(ex);
                 throw new EmailAlreadyRegistreredException();