diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/SecurityPreferencesFragment.java b/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/SecurityPreferencesFragment.java
index ae6f4dbb..3595539a 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/SecurityPreferencesFragment.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/SecurityPreferencesFragment.java
@@ -121,6 +121,7 @@ public class SecurityPreferencesFragment extends PreferencesFragment {
                         .setNegativeButton(android.R.string.no, null)
                         .create());
             }
+
             return false;
         });
 
@@ -383,6 +384,7 @@ public class SecurityPreferencesFragment extends PreferencesFragment {
             }
 
             getActivity().startService(new Intent(getActivity(), NotificationService.class));
+            _pinKeyboardPreference.setChecked(false);
             updateEncryptionPreferences();
         }