diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0e428169430..e6bed299521 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2984,6 +2984,10 @@ found in the list of installed applications.</string>
          networks and the UI is showing one possible existing network.
          Used in Wifi Setup. -->
     <string name="wifi_setup_status_existing_network">Connect to existing network</string>
+    <!-- Message shown above available networks when a user clicked one of available
+         networks and the network doesn't require configuration (e.g. password)
+         Used in Wifi Setup with XL screen. [CHAR LIMIT=35] -->
+    <string name="wifi_setup_status_unsecured_network">Connect to unsecured network</string>
     <!-- Message shown above available networks when a user clicked one of available
          networks and the UI is prompting the user to edit the network configuration
          if needed. Used in Wifi Setup with XL screen. [CHAR LIMIT=35] -->
diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
index 1781847ba0b..145e6824c5d 100644
--- a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
+++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
@@ -265,7 +265,6 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
         mProgressBar.setIndeterminate(false);
         mProgressBar.setProgress(0);
 
-        mStatusText.setText(stateString);
         mProgressText.setText(stateString);
 
         mAddNetworkButton.setEnabled(true);
@@ -322,7 +321,11 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
         }
         // parent.addView(view);
 
-        mStatusText.setText(R.string.wifi_setup_status_edit_network);
+        if (selectedAccessPoint.security == AccessPoint.SECURITY_NONE) {
+            mStatusText.setText(R.string.wifi_setup_status_unsecured_network);
+        } else {
+            mStatusText.setText(R.string.wifi_setup_status_edit_network);
+        }
         mAddNetworkButton.setVisibility(View.GONE);
         mRefreshButton.setVisibility(View.GONE);
         mSkipOrNextButton.setVisibility(View.GONE);