diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1d763eede4e..839d13c0d4c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -718,10 +718,10 @@
     <string name="device_admin_title">Device administration</string>
 
     <!-- Title of preference to manage device admins -->
-    <string name="manage_device_admin">Select device administrators</string>
+    <string name="manage_device_admin">Device administrators</string>
 
     <!-- Summary of preference to manage device policies -->
-    <string name="manage_device_admin_summary">Add or remove device administrators</string>
+    <string name="manage_device_admin_summary">View or deactivate device administrators</string>
 
     <!-- Bluetooth settings -->
     <!-- Bluetooth settings check box title on Main Settings screen -->
diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java
index 72dba1ab4dd..3f0c02fb73c 100644
--- a/src/com/android/settings/ApnEditor.java
+++ b/src/com/android/settings/ApnEditor.java
@@ -234,6 +234,8 @@ public class ApnEditor extends PreferenceActivity
             int authVal = mCursor.getInt(AUTH_TYPE_INDEX);
             if (authVal != -1) {
                 mAuthType.setValueIndex(authVal);
+            } else {
+                mAuthType.setValue(null);
             }
 
         }