diff --git a/src/org/linphone/AccountPreferencesFragment.java b/src/org/linphone/AccountPreferencesFragment.java
index 2a9064c35..f1d062df0 100644
--- a/src/org/linphone/AccountPreferencesFragment.java
+++ b/src/org/linphone/AccountPreferencesFragment.java
@@ -94,7 +94,7 @@ public class AccountPreferencesFragment extends PreferencesListFragment {
    
     	final Preference disable = advanced.getPreference(2);
     	disable.setEnabled(prefs.getInt(getString(R.string.pref_default_account), 0) != n);
-    	Compatibility.setPreferenceChecked(outboundProxy, prefs.getBoolean(getString(R.string.pref_disable_account_key) + getAccountNumber(n), false));
+    	Compatibility.setPreferenceChecked(disable, prefs.getBoolean(getString(R.string.pref_disable_account_key) + getAccountNumber(n), false));
     	disable.setKey(getString(R.string.pref_disable_account_key) + getAccountNumber(n));
 
     	final Preference delete = advanced.getPreference(4);
diff --git a/src/org/linphone/PreferencesFragment.java b/src/org/linphone/PreferencesFragment.java
index e81f9be7e..7529e089c 100644
--- a/src/org/linphone/PreferencesFragment.java
+++ b/src/org/linphone/PreferencesFragment.java
@@ -33,6 +33,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.linphone.LinphoneManager.EcCalibrationListener;
+import org.linphone.compatibility.Compatibility;
 import org.linphone.core.LinphoneCore;
 import org.linphone.core.LinphoneCore.EcCalibratorStatus;
 import org.linphone.core.LinphoneCore.MediaEncryption;
@@ -299,9 +300,9 @@ public class PreferencesFragment extends PreferencesListFragment implements EcCa
 	}
 	
 	private void manageCheckbox(int key, boolean value, boolean enabled, boolean hidden) {
-		CheckBoxPreference box = (CheckBoxPreference) findPreference(key);
+		Preference box = findPreference(key);
 		box.setEnabled(enabled);
-		box.setChecked(value);
+		Compatibility.setPreferenceChecked(box, value);
 		writeBoolean(key, value);
 		if (hidden) box.setLayoutResource(R.layout.hidden);
 	}
diff --git a/src/org/linphone/compatibility/ApiFourteenPlus.java b/src/org/linphone/compatibility/ApiFourteenPlus.java
index 9a64ba4c2..04cd075d2 100644
--- a/src/org/linphone/compatibility/ApiFourteenPlus.java
+++ b/src/org/linphone/compatibility/ApiFourteenPlus.java
@@ -2,7 +2,7 @@ package org.linphone.compatibility;
 
 import android.annotation.TargetApi;
 import android.preference.Preference;
-import android.preference.SwitchPreference;
+import android.preference.TwoStatePreference;
 
 /*
 ApiFourteenPlus.java
@@ -29,10 +29,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 public class ApiFourteenPlus {
 
 	public static void setPreferenceChecked(Preference preference, boolean checked) {
-		((SwitchPreference) preference).setChecked(checked);
+		((TwoStatePreference) preference).setChecked(checked);
 	}
 	
 	public static boolean isPreferenceChecked(Preference preference) {
-		return ((SwitchPreference) preference).isChecked();
+		return ((TwoStatePreference) preference).isChecked();
 	}
 }