diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppSettingsActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppSettingsActivity.java
index 30a0a2b4fcf9..063b16a3e75b 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppSettingsActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppSettingsActivity.java
@@ -3,11 +3,13 @@
 import android.app.FragmentManager;
 import android.os.Bundle;
 import android.preference.Preference;
+import android.preference.SwitchPreference;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
 import android.view.MenuItem;
 
 import org.wordpress.android.ui.ActivityLauncher;
+import org.wordpress.passcodelock.AppLockManager;
 import org.wordpress.passcodelock.PasscodePreferenceFragment;
 
 public class AppSettingsActivity extends AppCompatActivity {
@@ -56,6 +58,8 @@ public void onStart() {
 
         if (togglePref != null && changePref != null) {
             mPasscodePreferenceFragment.setPreferences(togglePref, changePref);
+            ((SwitchPreference) togglePref).setChecked(
+                    AppLockManager.getInstance().getAppLock().isPasswordLocked());
         }
     }
 
diff --git a/WordPress/src/main/res/xml/app_settings.xml b/WordPress/src/main/res/xml/app_settings.xml
index b9e1265523de..5367dd7127d0 100644
--- a/WordPress/src/main/res/xml/app_settings.xml
+++ b/WordPress/src/main/res/xml/app_settings.xml
@@ -34,7 +34,7 @@
         android:persistent="false"
         android:title="@string/passcode_preference_title">
 
-        <Preference
+        <SwitchPreference
             android:key="@string/pref_key_passcode_toggle"
             android:layout="@layout/preference_layout"
             android:persistent="false"