From fc15525fb35647eb28b5868abb91a75eed04754d Mon Sep 17 00:00:00 2001
From: Jakob Ackermann <jakob.ackermann@overleaf.com>
Date: Fri, 26 Mar 2021 10:53:01 +0100
Subject: [PATCH] Merge pull request #3816 from overleaf/jpa-fix-settings

[misc] fix the pre-filling of the users email in settings for Server Pro

GitOrigin-RevId: 7732c362a6ca4a16b8c89f3430fceebaaf27dee7
---
 services/web/frontend/js/directives/asyncForm.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/services/web/frontend/js/directives/asyncForm.js b/services/web/frontend/js/directives/asyncForm.js
index 3452f9ac86..d3a49a83ac 100644
--- a/services/web/frontend/js/directives/asyncForm.js
+++ b/services/web/frontend/js/directives/asyncForm.js
@@ -17,7 +17,11 @@ App.directive('asyncForm', ($http, validateCaptcha, validateCaptchaV3) => ({
 
     scope[attrs.name].response = response = {}
     scope[attrs.name].inflight = false
-    scope.email = scope.email || ctrl.getEmailFromQuery() || attrs.newEmail
+    scope.email =
+      scope.email ||
+      scope.usersEmail ||
+      ctrl.getEmailFromQuery() ||
+      attrs.newEmail
 
     const validateCaptchaIfEnabled = function(callback) {
       if (attrs.captchaActionName) {