diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index 5d8c549..bf0ace3 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -745,7 +745,7 @@
         boolean canChange4glte = (tm.getCallState() == TelephonyManager.CALL_STATE_IDLE) &&
                 ImsManager.isNonTtyOrTtyOnVolteEnabled(getApplicationContext()) &&
                 carrierConfig.getBoolean(CarrierConfigManager.KEY_EDITABLE_ENHANCED_4G_LTE_BOOL);
-        mButtonDataRoam.setDisabledByAdmin(null);
+        mButtonDataRoam.setDisabledByAdmin(false);
         mButtonDataRoam.setEnabled(hasActiveSubscriptions);
         if (mButtonDataRoam.isEnabled()) {
             if (RestrictedLockUtils.hasBaseUserRestriction(context,
diff --git a/src/com/android/phone/RestrictedSwitchPreference.java b/src/com/android/phone/RestrictedSwitchPreference.java
index fd2b222..ba6b65e 100644
--- a/src/com/android/phone/RestrictedSwitchPreference.java
+++ b/src/com/android/phone/RestrictedSwitchPreference.java
@@ -17,6 +17,7 @@
 package com.android.phone;
 
 import android.content.Context;
+import android.os.UserHandle;
 import android.os.UserManager;
 import android.preference.PreferenceScreen;
 import android.preference.SwitchPreference;
@@ -30,7 +31,6 @@
 public class RestrictedSwitchPreference extends SwitchPreference {
     private final Context mContext;
     private boolean mDisabledByAdmin;
-    private EnforcedAdmin mEnforcedAdmin;
     private final int mSwitchWidgetResId;
 
     public RestrictedSwitchPreference(Context context, AttributeSet attrs, int defStyleAttr,
@@ -67,22 +67,23 @@
     }
 
     public void checkRestrictionAndSetDisabled(String userRestriction) {
-        setDisabledByAdmin(RestrictedLockUtils.checkIfRestrictionEnforced(mContext, userRestriction,
-                UserManager.get(mContext).getUserHandle()));
+        UserManager um = UserManager.get(mContext);
+        UserHandle user = UserHandle.of(um.getUserHandle());
+        boolean disabledByAdmin = um.hasUserRestriction(userRestriction, user)
+                && !um.hasBaseUserRestriction(userRestriction, user);
+        setDisabledByAdmin(disabledByAdmin);
     }
 
     @Override
     public void setEnabled(boolean enabled) {
         if (enabled && mDisabledByAdmin) {
-            setDisabledByAdmin(null);
+            setDisabledByAdmin(false);
         } else {
             super.setEnabled(enabled);
         }
     }
 
-    public void setDisabledByAdmin(EnforcedAdmin admin) {
-        final boolean disabled = (admin != null ? true : false);
-        mEnforcedAdmin = admin;
+    public void setDisabledByAdmin(boolean disabled) {
         if (mDisabledByAdmin != disabled) {
             mDisabledByAdmin = disabled;
             setWidgetLayoutResource(disabled ? R.layout.restricted_icon : mSwitchWidgetResId);
@@ -93,7 +94,8 @@
     @Override
     public void performClick(PreferenceScreen preferenceScreen) {
         if (mDisabledByAdmin) {
-            RestrictedLockUtils.sendShowAdminSupportDetailsIntent(mContext, mEnforcedAdmin);
+            RestrictedLockUtils.sendShowAdminSupportDetailsIntent(mContext,
+                    new EnforcedAdmin());
         } else {
             super.performClick(preferenceScreen);
         }