From 074f1ee7b7b1c866fdb22184505cef1fad005e0c Mon Sep 17 00:00:00 2001
From: Addison Beck <abeck@bitwarden.com>
Date: Fri, 21 Jan 2022 13:35:14 -0500
Subject: [PATCH] [bug] Set envUrls after assigning defaults during scaffolding
 (#627)

---
 common/src/services/state.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/src/services/state.service.ts b/common/src/services/state.service.ts
index 446b9fde78..a703fe6bba 100644
--- a/common/src/services/state.service.ts
+++ b/common/src/services/state.service.ts
@@ -2218,8 +2218,8 @@ export class StateService<TAccount extends Account = Account>
       account.settings = await this.storageService.get<any>(keys.tempAccountSettings);
       await this.storageService.remove(keys.tempAccountSettings);
     }
-    account.settings.environmentUrls = environmentUrls;
     Object.assign(account.settings, this.createAccount().settings);
+    account.settings.environmentUrls = environmentUrls;
     await this.storageService.save(
       account.profile.userId,
       account,