diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java
index 7732837..9a2d14a 100644
--- a/src/com/android/settings/PrivacySettings.java
+++ b/src/com/android/settings/PrivacySettings.java
@@ -61,7 +61,6 @@
     private static final String CONFIGURE_ACCOUNT = "configure_account";
     private static final String DATA_MANAGEMENT = "data_management";
     private static final String BACKUP_INACTIVE = "backup_inactive";
-    private static final String NETWORK_RESET = "network_reset";
     private static final String FACTORY_RESET = "factory_reset";
     private static final String TAG = "PrivacySettings";
     private IBackupManager mBackupManager;
@@ -331,9 +330,5 @@
                 UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId())) {
             nonVisibleKeys.add(FACTORY_RESET);
         }
-        if (RestrictedLockUtils.hasBaseUserRestriction(context,
-                UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId())) {
-            nonVisibleKeys.add(NETWORK_RESET);
-        }
     }
 }
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index 5b1d644..ddd45c3 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -72,6 +72,7 @@
     private static final String KEY_MOBILE_NETWORK_SETTINGS = "mobile_network_settings";
     private static final String KEY_MANAGE_MOBILE_PLAN = "manage_mobile_plan";
     private static final String KEY_WFC_SETTINGS = "wifi_calling_settings";
+    private static final String KEY_NETWORK_RESET = "network_reset";
 
     public static final String EXIT_ECM_RESULT = "exit_ecm_result";
     public static final int REQUEST_CODE_EXIT_ECM = 1;
@@ -336,6 +337,12 @@
             p.setEnabled(!TetherSettings
                     .isProvisioningNeededButUnavailable(getActivity()));
         }
+
+        // Remove network reset if not allowed
+        if (RestrictedLockUtils.hasBaseUserRestriction(activity,
+                UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId())) {
+            removePreference(KEY_NETWORK_RESET);
+        }
     }
 
     @Override
@@ -470,6 +477,11 @@
                     result.add(KEY_WFC_SETTINGS);
                 }
 
+                if (RestrictedLockUtils.hasBaseUserRestriction(context,
+                        UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId())) {
+                    result.add(KEY_NETWORK_RESET);
+                }
+
                 return result;
             }
         };
