 +}
 diff --git a/src/com/android/settings/EncryptUserConfirm.java b/src/com/android/settings/EncryptUserConfirm.java
 new file mode 100644
-index 0000000..c115b3d
+index 0000000..137b692
 --- /dev/null
 +++ b/src/com/android/settings/EncryptUserConfirm.java
-@@ -0,0 +1,136 @@
+@@ -0,0 +1,157 @@
 +package com.android.settings;
 +
 +import com.android.settings.CryptKeeperConfirm.Blank;

+                    addPreferencesFromResource(R.xml.security_settings_unencrypted);
+                }
                 break;
             }
         }
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index e93fa18..9ff4c2c 100644
--- a/src/com/android/settings/Settings.java

     public SecuritySettings() {
         super(null /* Don't ask for restrictions pin on creation. */);
     }
@@ -183,17 +208,21 @@ public class SecuritySettings extends RestrictedSettingsFragment
             }
         }
 
-        if (mIsPrimary) {
-            switch (mDPM.getStorageEncryptionStatus()) {
+        switch (mDPM.getStorageEncryptionStatus()) {
             case DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE:
                 // The device is currently encrypted.
                 addPreferencesFromResource(R.xml.security_settings_encrypted);
                 break;
             case DevicePolicyManager.ENCRYPTION_STATUS_INACTIVE:
                 // This device supports encryption but isn't encrypted.
