diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 5a5804e6c46..7f8cec705c7 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -233,9 +233,10 @@ public class SecuritySettings extends PreferenceActivity implements
         PreferenceCategory credStoreCat = new PreferenceCategory(this);
         credStoreCat.setTitle(R.string.cstor_settings_category);
         root.addPreference(credStoreCat);
-        credStoreCat.addPreference(mCstorHelper.createAccessCheckBox());
+        boolean i = mCstorHelper.isCstorInitialized();
+        credStoreCat.addPreference(mCstorHelper.createAccessCheckBox(i));
         credStoreCat.addPreference(mCstorHelper.createSetPasswordPreference());
-        credStoreCat.addPreference(mCstorHelper.createResetPreference());
+        credStoreCat.addPreference(mCstorHelper.createResetPreference(i));
 
         return root;
     }
@@ -793,12 +794,12 @@ public class SecuritySettings extends PreferenceActivity implements
             mResetButton.setEnabled(enabled);
         }
 
-        private Preference createAccessCheckBox() {
+        private Preference createAccessCheckBox(boolean isInitialized) {
             CheckBoxPreference pref = new CheckBoxPreference(
                     SecuritySettings.this);
             pref.setTitle(R.string.cstor_access_title);
             pref.setSummary(R.string.cstor_access_summary);
-            pref.setChecked(isCstorUnlocked());
+            if (isInitialized) pref.setChecked(isCstorUnlocked());
             pref.setOnPreferenceChangeListener(
                     new Preference.OnPreferenceChangeListener() {
                         public boolean onPreferenceChange(
@@ -813,7 +814,7 @@ public class SecuritySettings extends PreferenceActivity implements
                             return true;
                         }
                     });
-            pref.setEnabled(isCstorInitialized());
+            pref.setEnabled(isInitialized);
             mAccessCheckBox = pref;
             return pref;
         }
@@ -834,7 +835,7 @@ public class SecuritySettings extends PreferenceActivity implements
             return pref;
         }
 
-        private Preference createResetPreference() {
+        private Preference createResetPreference(boolean isInitialized) {
             Preference pref = new Preference(SecuritySettings.this);
             pref.setTitle(R.string.cstor_reset_title);
             pref.setSummary(R.string.cstor_reset_summary);
@@ -845,7 +846,7 @@ public class SecuritySettings extends PreferenceActivity implements
                             return true;
                         }
                     });
-            pref.setEnabled(isCstorInitialized());
+            pref.setEnabled(isInitialized);
             mResetButton = pref;
             return pref;
         }