diff --git a/src/ui/pages/encrypt.py b/src/ui/pages/encrypt.py
index 78c7172..967fe91 100644
--- a/src/ui/pages/encrypt.py
+++ b/src/ui/pages/encrypt.py
@@ -23,6 +23,9 @@ class EncryptPage(Gtk.Box):
         if encryption_setting['forced']:
             self.switch_row.set_active(True)
             self.switch_row.set_visible(False)
+        else:
+            self.switch_row.set_active(config.get('use_encryption'))
+        self.pin_row.set_text(config.get('encryption_pin'))
 
     def _set_continue_button(self):
         needs_pin = self.switch_row.get_active()