diff --git a/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginEmailFragment.java b/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginEmailFragment.java
index d265f462069..43386bb8644 100644
--- a/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginEmailFragment.java
+++ b/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginEmailFragment.java
@@ -137,7 +137,12 @@ protected void setupContent(ViewGroup rootView) {
         if (BuildConfig.DEBUG) {
             mEmailInput.getEditText().setText(BuildConfig.DEBUG_WPCOM_LOGIN_EMAIL);
         }
-        mEmailInput.addTextChangedListener(this);
+        mEmailInput.post(new Runnable() {
+            @Override public void run() {
+                mEmailInput.addTextChangedListener(LoginEmailFragment.this);
+            }
+        });
+
         mEmailInput.setOnEditorCommitListener(this);
         mEmailInput.getEditText().setOnFocusChangeListener(new View.OnFocusChangeListener() {
             @Override
@@ -393,6 +398,7 @@ public void beforeTextChanged(CharSequence s, int start, int count, int after) {
     public void onTextChanged(CharSequence s, int start, int before, int count) {
         mEmailInput.setError(null);
         mIsSocialLogin = false;
+        mIsValidEmail = null;
     }
 
     private void showEmailError(int messageId) {