From 1281f348bf9e5cf3db46ef9cf0b7370b6e6a09cc Mon Sep 17 00:00:00 2001
From: Kukks <evilkukka@gmail.com>
Date: Fri, 22 Mar 2019 12:52:38 +0100
Subject: [PATCH 1/3] set username on email change

closes #673
---
 BTCPayServer/Controllers/ManageController.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/BTCPayServer/Controllers/ManageController.cs b/BTCPayServer/Controllers/ManageController.cs
index 65341743f..edbb0c625 100644
--- a/BTCPayServer/Controllers/ManageController.cs
+++ b/BTCPayServer/Controllers/ManageController.cs
@@ -111,6 +111,7 @@ namespace BTCPayServer.Controllers
                 var setEmailResult = await _userManager.SetEmailAsync(user, model.Email);
                 if (!setEmailResult.Succeeded)
                 {
+                    await _userManager.SetUserNameAsync(user, model.Username);
                     throw new ApplicationException($"Unexpected error occurred setting email for user with ID '{user.Id}'.");
                 }
             }

From 686bc3380d943738cb91111929efeac801c0f760 Mon Sep 17 00:00:00 2001
From: Andrew Camilleri <evilkukka@gmail.com>
Date: Sun, 24 Mar 2019 16:09:20 +0100
Subject: [PATCH 2/3] Update ManageController.cs

---
 BTCPayServer/Controllers/ManageController.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BTCPayServer/Controllers/ManageController.cs b/BTCPayServer/Controllers/ManageController.cs
index edbb0c625..bb104a72c 100644
--- a/BTCPayServer/Controllers/ManageController.cs
+++ b/BTCPayServer/Controllers/ManageController.cs
@@ -110,10 +110,10 @@ namespace BTCPayServer.Controllers
             {
                 var setEmailResult = await _userManager.SetEmailAsync(user, model.Email);
                 if (!setEmailResult.Succeeded)
-                {
-                    await _userManager.SetUserNameAsync(user, model.Username);
+                {                    
                     throw new ApplicationException($"Unexpected error occurred setting email for user with ID '{user.Id}'.");
                 }
+                await _userManager.SetUserNameAsync(user, model.Username);
             }
 
             var phoneNumber = user.PhoneNumber;

From ea53ae8f20be30cd54050df945ed5be2df077f0c Mon Sep 17 00:00:00 2001
From: Andrew Camilleri <evilkukka@gmail.com>
Date: Sun, 24 Mar 2019 16:09:36 +0100
Subject: [PATCH 3/3] Update ManageController.cs

---
 BTCPayServer/Controllers/ManageController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BTCPayServer/Controllers/ManageController.cs b/BTCPayServer/Controllers/ManageController.cs
index bb104a72c..681f5c8df 100644
--- a/BTCPayServer/Controllers/ManageController.cs
+++ b/BTCPayServer/Controllers/ManageController.cs
@@ -110,7 +110,7 @@ namespace BTCPayServer.Controllers
             {
                 var setEmailResult = await _userManager.SetEmailAsync(user, model.Email);
                 if (!setEmailResult.Succeeded)
-                {                    
+                {
                     throw new ApplicationException($"Unexpected error occurred setting email for user with ID '{user.Id}'.");
                 }
                 await _userManager.SetUserNameAsync(user, model.Username);