From f0139f12ca6f93b7626be369dc2a829c0326c6e0 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Wed, 3 Mar 2021 14:01:34 +0000
Subject: [PATCH] Don't return error when account conflict is handled
 gracefully (#1782)

---
 userapi/internal/api.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/userapi/internal/api.go b/userapi/internal/api.go
index 4abf908d..e104714b 100644
--- a/userapi/internal/api.go
+++ b/userapi/internal/api.go
@@ -87,7 +87,7 @@ func (a *UserInternalAPI) PerformAccountCreation(ctx context.Context, req *api.P
 			ServerName:   a.ServerName,
 			UserID:       fmt.Sprintf("@%s:%s", req.Localpart, a.ServerName),
 		}
-		return err
+		return nil
 	}
 
 	if err = a.AccountDB.SetDisplayName(ctx, req.Localpart, req.Localpart); err != nil {