diff --git a/PasscodeLock/PasscodeLockViewController.swift b/PasscodeLock/PasscodeLockViewController.swift
index 095f10f2..acb22afe 100644
--- a/PasscodeLock/PasscodeLockViewController.swift
+++ b/PasscodeLock/PasscodeLockViewController.swift
@@ -270,4 +270,8 @@ public class PasscodeLockViewController: UIViewController, PasscodeLockTypeDeleg
             deleteSignButton?.enabled = false
         }
     }
+    
+    override public func prefersStatusBarHidden() -> Bool {
+        return true
+    }
 }
diff --git a/PasscodeLockDemo/PasscodeSettingsViewController.swift b/PasscodeLockDemo/PasscodeSettingsViewController.swift
index 36ac6123..434b0197 100644
--- a/PasscodeLockDemo/PasscodeSettingsViewController.swift
+++ b/PasscodeLockDemo/PasscodeSettingsViewController.swift
@@ -64,7 +64,8 @@ class PasscodeSettingsViewController: UIViewController {
             passcodeVC = PasscodeLockViewController(state: .RemovePasscode, configuration: configuration)
             
             passcodeVC.successCallback = { lock in
-                
+                self.passcodeSwitch.on = !self.passcodeSwitch.on
+                self.changePasscodeButton.hidden = true
                 lock.repository.deletePasscode()
             }
         }