diff --git a/pass/SettingsTableViewController.swift b/pass/SettingsTableViewController.swift
index 7268530..9fac3d9 100644
--- a/pass/SettingsTableViewController.swift
+++ b/pass/SettingsTableViewController.swift
@@ -168,6 +168,8 @@ class SettingsTableViewController: UITableViewController {
             passcodeRemoveViewController.successCallback  = { _ in
                 self.passcodeTableViewCell.detailTextLabel?.text = "Off"
                 self.touchIDSwitch.isEnabled = false
+                let appDelegate = UIApplication.shared.delegate as! AppDelegate
+                appDelegate.passcodeLockPresenter = PasscodeLockPresenter(mainWindow: appDelegate.window, configuration: Globals.passcodeConfiguration)
             }
             self.present(passcodeRemoveViewController, animated: true, completion: nil)
         }