diff --git a/packages/LineagePreferenceLib/java/lineageos/preference/LineageSecureSettingMainSwitchPreference.java b/packages/LineagePreferenceLib/java/lineageos/preference/LineageSecureSettingMainSwitchPreference.java
index 9ad62aad..1d0d62a0 100644
--- a/packages/LineagePreferenceLib/java/lineageos/preference/LineageSecureSettingMainSwitchPreference.java
+++ b/packages/LineagePreferenceLib/java/lineageos/preference/LineageSecureSettingMainSwitchPreference.java
@@ -6,6 +6,7 @@
 package lineageos.preference;
 
 import android.content.Context;
+import android.os.UserHandle;
 import android.util.AttributeSet;
 
 import androidx.preference.PreferenceDataStore;
@@ -35,13 +36,13 @@ public class LineageSecureSettingMainSwitchPreference extends MainSwitchPreferen
     private class DataStore extends PreferenceDataStore {
         @Override
         public void putBoolean(String key, boolean value) {
-            LineageSettings.Secure.putInt(getContext().getContentResolver(), key, value ? 1 : 0);
+            LineageSettings.Secure.putIntForUser(getContext().getContentResolver(), key, value ? 1 : 0, UserHandle.USER_CURRENT);
         }
 
         @Override
         public boolean getBoolean(String key, boolean defaultValue) {
-            return LineageSettings.Secure.getInt(getContext().getContentResolver(), key,
-                    defaultValue ? 1 : 0) != 0;
+            return LineageSettings.Secure.getIntForUser(getContext().getContentResolver(), key,
+                    defaultValue ? 1 : 0, UserHandle.USER_CURRENT) != 0;
         }
     }
 }
diff --git a/packages/LineagePreferenceLib/java/lineageos/preference/LineageSecureSettingSwitchPreference.java b/packages/LineagePreferenceLib/java/lineageos/preference/LineageSecureSettingSwitchPreference.java
index 3347e81d..d052dc24 100644
--- a/packages/LineagePreferenceLib/java/lineageos/preference/LineageSecureSettingSwitchPreference.java
+++ b/packages/LineagePreferenceLib/java/lineageos/preference/LineageSecureSettingSwitchPreference.java
@@ -7,6 +7,7 @@
 package lineageos.preference;
 
 import android.content.Context;
+import android.os.UserHandle;
 import android.util.AttributeSet;
 
 import lineageos.providers.LineageSettings;
@@ -32,12 +33,12 @@ public class LineageSecureSettingSwitchPreference extends SelfRemovingSwitchPref
 
     @Override
     protected void putBoolean(String key, boolean value) {
-        LineageSettings.Secure.putInt(getContext().getContentResolver(), key, value ? 1 : 0);
+        LineageSettings.Secure.putIntForUser(getContext().getContentResolver(), key, value ? 1 : 0, UserHandle.USER_CURRENT);
     }
 
     @Override
     protected boolean getBoolean(String key, boolean defaultValue) {
-        return LineageSettings.Secure.getInt(getContext().getContentResolver(),
-                key, defaultValue ? 1 : 0) != 0;
+        return LineageSettings.Secure.getIntForUser(getContext().getContentResolver(),
+                key, defaultValue ? 1 : 0, UserHandle.USER_CURRENT) != 0;
     }
 }
diff --git a/packages/LineagePreferenceLib/java/lineageos/preference/LineageSystemSettingMainSwitchPreference.java b/packages/LineagePreferenceLib/java/lineageos/preference/LineageSystemSettingMainSwitchPreference.java
index f0d1847a..a88c6027 100644
--- a/packages/LineagePreferenceLib/java/lineageos/preference/LineageSystemSettingMainSwitchPreference.java
+++ b/packages/LineagePreferenceLib/java/lineageos/preference/LineageSystemSettingMainSwitchPreference.java
@@ -6,6 +6,7 @@
 package lineageos.preference;
 
 import android.content.Context;
+import android.os.UserHandle;
 import android.util.AttributeSet;
 
 import androidx.preference.PreferenceDataStore;
@@ -35,13 +36,13 @@ public class LineageSystemSettingMainSwitchPreference extends MainSwitchPreferen
     private class DataStore extends PreferenceDataStore {
         @Override
         public void putBoolean(String key, boolean value) {
-            LineageSettings.System.putInt(getContext().getContentResolver(), key, value ? 1 : 0);
+            LineageSettings.System.putIntForUser(getContext().getContentResolver(), key, value ? 1 : 0, UserHandle.USER_CURRENT);
         }
 
         @Override
         public boolean getBoolean(String key, boolean defaultValue) {
-            return LineageSettings.System.getInt(getContext().getContentResolver(), key,
-                    defaultValue ? 1 : 0) != 0;
+            return LineageSettings.System.getIntForUser(getContext().getContentResolver(), key,
+                    defaultValue ? 1 : 0, UserHandle.USER_CURRENT) != 0;
         }
     }
 }
diff --git a/packages/LineagePreferenceLib/java/lineageos/preference/LineageSystemSettingSwitchPreference.java b/packages/LineagePreferenceLib/java/lineageos/preference/LineageSystemSettingSwitchPreference.java
index 17103902..52ed9d05 100644
--- a/packages/LineagePreferenceLib/java/lineageos/preference/LineageSystemSettingSwitchPreference.java
+++ b/packages/LineagePreferenceLib/java/lineageos/preference/LineageSystemSettingSwitchPreference.java
@@ -7,6 +7,7 @@
 package lineageos.preference;
 
 import android.content.Context;
+import android.os.UserHandle;
 import android.util.AttributeSet;
 
 import lineageos.providers.LineageSettings;
@@ -32,12 +33,12 @@ public class LineageSystemSettingSwitchPreference extends SelfRemovingSwitchPref
 
     @Override
     protected void putBoolean(String key, boolean value) {
-        LineageSettings.System.putInt(getContext().getContentResolver(), key, value ? 1 : 0);
+        LineageSettings.System.putIntForUser(getContext().getContentResolver(), key, value ? 1 : 0, UserHandle.USER_CURRENT);
     }
 
     @Override
     protected boolean getBoolean(String key, boolean defaultValue) {
-        return LineageSettings.System.getInt(getContext().getContentResolver(),
-                key, defaultValue ? 1 : 0) != 0;
+        return LineageSettings.System.getIntForUser(getContext().getContentResolver(),
+                key, defaultValue ? 1 : 0, UserHandle.USER_CURRENT) != 0;
     }
 }
diff --git a/packages/LineagePreferenceLib/java/lineageos/preference/SecureSettingMainSwitchPreference.java b/packages/LineagePreferenceLib/java/lineageos/preference/SecureSettingMainSwitchPreference.java
index a12dde08..5abf4aa4 100644
--- a/packages/LineagePreferenceLib/java/lineageos/preference/SecureSettingMainSwitchPreference.java
+++ b/packages/LineagePreferenceLib/java/lineageos/preference/SecureSettingMainSwitchPreference.java
@@ -6,6 +6,7 @@
 package lineageos.preference;
 
 import android.content.Context;
+import android.os.UserHandle;
 import android.provider.Settings;
 import android.util.AttributeSet;
 
@@ -33,13 +34,13 @@ public class SecureSettingMainSwitchPreference extends MainSwitchPreference {
     private class DataStore extends PreferenceDataStore {
         @Override
         public void putBoolean(String key, boolean value) {
-            Settings.Secure.putInt(getContext().getContentResolver(), key, value ? 1 : 0);
+            Settings.Secure.putIntForUser(getContext().getContentResolver(), key, value ? 1 : 0, UserHandle.USER_CURRENT);
         }
 
         @Override
         public boolean getBoolean(String key, boolean defaultValue) {
-            return Settings.Secure.getInt(getContext().getContentResolver(), key,
-                    defaultValue ? 1 : 0) != 0;
+            return Settings.Secure.getIntForUser(getContext().getContentResolver(), key,
+                    defaultValue ? 1 : 0, UserHandle.USER_CURRENT) != 0;
         }
     }
 }
diff --git a/packages/LineagePreferenceLib/java/lineageos/preference/SecureSettingSwitchPreference.java b/packages/LineagePreferenceLib/java/lineageos/preference/SecureSettingSwitchPreference.java
index 31d11d82..da1364f5 100644
--- a/packages/LineagePreferenceLib/java/lineageos/preference/SecureSettingSwitchPreference.java
+++ b/packages/LineagePreferenceLib/java/lineageos/preference/SecureSettingSwitchPreference.java
@@ -7,6 +7,7 @@
 package lineageos.preference;
 
 import android.content.Context;
+import android.os.UserHandle;
 import android.provider.Settings;
 import android.util.AttributeSet;
 
@@ -31,12 +32,12 @@ public class SecureSettingSwitchPreference extends SelfRemovingSwitchPreference
 
     @Override
     protected void putBoolean(String key, boolean value) {
-        Settings.Secure.putInt(getContext().getContentResolver(), key, value ? 1 : 0);
+        Settings.Secure.putIntForUser(getContext().getContentResolver(), key, value ? 1 : 0, UserHandle.USER_CURRENT);
     }
 
     @Override
     protected boolean getBoolean(String key, boolean defaultValue) {
-        return Settings.Secure.getInt(getContext().getContentResolver(),
-                key, defaultValue ? 1 : 0) != 0;
+        return Settings.Secure.getIntForUser(getContext().getContentResolver(),
+                key, defaultValue ? 1 : 0, UserHandle.USER_CURRENT) != 0;
     }
 }
diff --git a/packages/LineagePreferenceLib/java/lineageos/preference/SystemSettingMainSwitchPreference.java b/packages/LineagePreferenceLib/java/lineageos/preference/SystemSettingMainSwitchPreference.java
index 38ac17cf..52aa70ff 100644
--- a/packages/LineagePreferenceLib/java/lineageos/preference/SystemSettingMainSwitchPreference.java
+++ b/packages/LineagePreferenceLib/java/lineageos/preference/SystemSettingMainSwitchPreference.java
@@ -6,6 +6,7 @@
 package lineageos.preference;
 
 import android.content.Context;
+import android.os.UserHandle;
 import android.provider.Settings;
 import android.util.AttributeSet;
 
@@ -33,13 +34,13 @@ public class SystemSettingMainSwitchPreference extends MainSwitchPreference {
     private class DataStore extends PreferenceDataStore {
         @Override
         public void putBoolean(String key, boolean value) {
-            Settings.System.putInt(getContext().getContentResolver(), key, value ? 1 : 0);
+            Settings.System.putIntForUser(getContext().getContentResolver(), key, value ? 1 : 0, UserHandle.USER_CURRENT);
         }
 
         @Override
         public boolean getBoolean(String key, boolean defaultValue) {
-            return Settings.System.getInt(getContext().getContentResolver(), key,
-                    defaultValue ? 1 : 0) != 0;
+            return Settings.System.getIntForUser(getContext().getContentResolver(), key,
+                    defaultValue ? 1 : 0, UserHandle.USER_CURRENT) != 0;
         }
     }
 }
diff --git a/packages/LineagePreferenceLib/java/lineageos/preference/SystemSettingSwitchPreference.java b/packages/LineagePreferenceLib/java/lineageos/preference/SystemSettingSwitchPreference.java
index de38d1a4..b23bce68 100644
--- a/packages/LineagePreferenceLib/java/lineageos/preference/SystemSettingSwitchPreference.java
+++ b/packages/LineagePreferenceLib/java/lineageos/preference/SystemSettingSwitchPreference.java
@@ -7,6 +7,7 @@
 package lineageos.preference;
 
 import android.content.Context;
+import android.os.UserHandle;
 import android.provider.Settings;
 import android.util.AttributeSet;
 
@@ -31,12 +32,12 @@ public class SystemSettingSwitchPreference extends SelfRemovingSwitchPreference
 
     @Override
     protected void putBoolean(String key, boolean value) {
-        Settings.System.putInt(getContext().getContentResolver(), key, value ? 1 : 0);
+        Settings.System.putIntForUser(getContext().getContentResolver(), key, value ? 1 : 0, UserHandle.USER_CURRENT);
     }
 
     @Override
     protected boolean getBoolean(String key, boolean defaultValue) {
-        return Settings.System.getInt(getContext().getContentResolver(),
-                key, defaultValue ? 1 : 0) != 0;
+        return Settings.System.getIntForUser(getContext().getContentResolver(),
+                key, defaultValue ? 1 : 0, UserHandle.USER_CURRENT) != 0;
     }
 }