diff --git a/src/com/android/email/activity/setup/AccountSetupExchangeFragment.java b/src/com/android/email/activity/setup/AccountSetupExchangeFragment.java
index fdcc7c28a..72ae31127 100644
--- a/src/com/android/email/activity/setup/AccountSetupExchangeFragment.java
+++ b/src/com/android/email/activity/setup/AccountSetupExchangeFragment.java
@@ -262,6 +262,10 @@ public class AccountSetupExchangeFragment extends AccountServerBaseFragment
 
         if (hostAuth.mPassword != null) {
             mPasswordView.setText(hostAuth.mPassword);
+            // Since username is uneditable, focus on the next editable field
+            if (mSettingsMode) {
+                mPasswordView.requestFocus();
+            }
         }
 
         String protocol = hostAuth.mProtocol;
diff --git a/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java b/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java
index 7b37775e1..41fa6134d 100644
--- a/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java
+++ b/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java
@@ -313,6 +313,10 @@ public class AccountSetupIncomingFragment extends AccountServerBaseFragment {
         String password = recvAuth.mPassword;
         if (password != null) {
             mPasswordView.setText(password);
+            // Since username is uneditable, focus on the next editable field
+            if (mSettingsMode) {
+                mPasswordView.requestFocus();
+            }
         }
 
         if (HostAuth.SCHEME_IMAP.equals(recvAuth.mProtocol)) {