diff --git a/res/layout/wifi_ap_dialog.xml b/res/layout/wifi_ap_dialog.xml
index f9c35b12a50..6d9691b0207 100644
--- a/res/layout/wifi_ap_dialog.xml
+++ b/res/layout/wifi_ap_dialog.xml
@@ -81,6 +81,13 @@
                     android:singleLine="true"
                     android:password="true" />
 
+            <TextView android:id="@+id/hint"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textSize="12sp"
+                    android:text="@string/credentials_password_too_short"
+                    android:layout_marginBottom="10sp"/>
+
             <CheckBox android:id="@+id/show_password"
                     style="?android:attr/textAppearanceSmallInverse"
                     android:layout_width="match_parent"
diff --git a/src/com/android/settings/wifi/WifiApSettings.java b/src/com/android/settings/wifi/WifiApSettings.java
index ec1016e9073..bca48351982 100644
--- a/src/com/android/settings/wifi/WifiApSettings.java
+++ b/src/com/android/settings/wifi/WifiApSettings.java
@@ -114,19 +114,21 @@ public class WifiApSettings extends PreferenceActivity
 
     public void onClick(DialogInterface dialogInterface, int button) {
 
-        mWifiConfig = mDialog.getConfig();
+        if (button == DialogInterface.BUTTON_POSITIVE) {
+            mWifiConfig = mDialog.getConfig();
+            if(mWifiConfig != null) {
+                mWifiManager.setWifiApEnabled(mWifiConfig, true);
+                mCreateNetwork.setSummary(String.format(getString(CONFIG_SUBTEXT),
+                            mWifiConfig.SSID,
+                            mWifiConfig.allowedKeyManagement.get(KeyMgmt.WPA_PSK) ?
+                            mSecurityType[WPA_INDEX] : mSecurityType[OPEN_INDEX]));
+                /**
+                 * There is no tether notification on changing AP
+                 * configuration. Update status with new config.
+                 */
+                mWifiApEnabler.updateConfigSummary(mWifiConfig);
 
-        if (button == DialogInterface.BUTTON_POSITIVE && mWifiConfig != null) {
-            mWifiManager.setWifiApEnabled(mWifiConfig, true);
-            mCreateNetwork.setSummary(String.format(getString(CONFIG_SUBTEXT),
-                                      mWifiConfig.SSID,
-                                      mWifiConfig.allowedKeyManagement.get(KeyMgmt.WPA_PSK) ?
-                                      mSecurityType[WPA_INDEX] : mSecurityType[OPEN_INDEX]));
-            /**
-             * There is no tether notification on changing AP
-             * configuration. Update status with new config.
-             */
-            mWifiApEnabler.updateConfigSummary(mWifiConfig);
+            }
         }
     }
 }