diff --git a/src/com/android/settings/vpn/AuthenticationActor.java b/src/com/android/settings/vpn/AuthenticationActor.java
index 286064f3cae..537438fa273 100644
--- a/src/com/android/settings/vpn/AuthenticationActor.java
+++ b/src/com/android/settings/vpn/AuthenticationActor.java
@@ -204,6 +204,7 @@ public class AuthenticationActor implements VpnProfileActor {
         usernameView.setText(username);
         passwordView.setText(password);
         saveUsername.setChecked(toSaveUsername);
+        if (toSaveUsername) passwordView.requestFocus();
     }
 
     private void broadcastConnectivity(VpnState s) {