From a340d9ac7b2f25a97010e9442278cd3181b5e6c6 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Tue, 16 Jun 2020 17:14:21 +0100
Subject: [PATCH] Return ErrorConflict

---
 userapi/internal/api.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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