             self.presentViewController(alert, animated: true, completion: nil)
         }
         
-        println("  - Setting auto theme = false")
-        self.config.setBool(false, forKey: "useAutoTheme")
+        dispatch_async(dispatch_get_main_queue(), {
+            println("  - Setting auto theme = false")
+            self.config.setBool(false, forKey: "useAutoTheme")
+            self.themeAutoSwitch.on = false
+        })
         
     }
     

    var config = NSUserDefaults.standardUserDefaults()
    var nc     = NSNotificationCenter.defaultCenter()
    
    override func viewDidLoad() {
        super.viewDidLoad()
        

        config.setBool(sender.on, forKey: "useAutoTheme")
        
        if sender.on == true {
            nc.postNotificationName(
                "GOSettingsRequestCameraAccessNotification",
                object: config
            )
        }
    }
    

    @IBAction func handleShowPasswordChange(sender: UISwitch) {
        passwordField.secureTextEntry = !sender.on
        config.setBool(sender.on, forKey: "showPassword")
