diff --git a/WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift b/WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift
index aaf35781a9b4..22da3004c88d 100644
--- a/WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift
+++ b/WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift
@@ -476,11 +476,11 @@ extension LoginEmailViewController: GIDSignInDelegate {
 
 extension LoginEmailViewController: LoginSocialErrorViewControllerDelegate {
     private func cleanupAfterSocialErrors() {
-        loginFields.username = ""
         dismiss(animated: true) {}
     }
 
     func retryWithEmail() {
+        loginFields.username = ""
         cleanupAfterSocialErrors()
     }
     func retryWithAddress() {
@@ -491,6 +491,7 @@ extension LoginEmailViewController: LoginSocialErrorViewControllerDelegate {
         cleanupAfterSocialErrors()
         let storyboard = UIStoryboard(name: "Login", bundle: nil)
         if let controller = storyboard.instantiateViewController(withIdentifier: "SignupViewController") as? NUXAbstractViewController {
+            controller.loginFields = loginFields
             navigationController?.pushViewController(controller, animated: true)
         }
     }
diff --git a/WordPress/Classes/ViewRelated/NUX/SignupViewController.swift b/WordPress/Classes/ViewRelated/NUX/SignupViewController.swift
index 7066918634d7..ffb4b5b762ff 100644
--- a/WordPress/Classes/ViewRelated/NUX/SignupViewController.swift
+++ b/WordPress/Classes/ViewRelated/NUX/SignupViewController.swift
@@ -74,6 +74,7 @@ import WordPressShared
 
         // Update special case login fields.
         loginFields.meta.userIsDotCom = true
+        emailField.text = loginFields.emailAddress
 
         configureLayoutForSmallScreensIfNeeded()
         configureSubmitButton(animating: false)