diff --git a/AutoCat/Controllers/Location/LocationEditController.swift b/AutoCat/Controllers/Location/LocationEditController.swift
index 936da97..d74f18a 100644
--- a/AutoCat/Controllers/Location/LocationEditController.swift
+++ b/AutoCat/Controllers/Location/LocationEditController.swift
@@ -27,6 +27,9 @@ class LocationEditController: FormViewController {
         }.onChange { row in
             if let newDate = row.value {
                 self.date = newDate
+                self.doneButton.isEnabled = true
+            } else {
+                self.doneButton.isEnabled = false
             }
         }
             
diff --git a/AutoCat/Controllers/SettingsController.swift b/AutoCat/Controllers/SettingsController.swift
index ea9f34d..b0ee610 100644
--- a/AutoCat/Controllers/SettingsController.swift
+++ b/AutoCat/Controllers/SettingsController.swift
@@ -72,20 +72,20 @@ class SettingsController: FormViewController {
                 }
             }
             
-		+++ Section("")
-			<<< ButtonRow("SignOut") { $0.title = NSLocalizedString("Sign Out", comment: "") }.onCellSelection { cell, row in
-				self.logout()
-			}
-
         +++ Section(NSLocalizedString("Debug", comment: ""))
             <<< SwitchRow() { row in
                 row.title = NSLocalizedString("Show debug info", comment: "")
-                row.value = Settings.shared.showDebugInfos
+                row.value = Settings.shared.showDebugInfo
             }.onChange { row in
                 if let val = row.value {
                     Settings.shared.showDebugInfo = val
                 }
             }
+            
+		+++ Section("")
+			<<< ButtonRow("SignOut") { $0.title = NSLocalizedString("Sign Out", comment: "") }.onCellSelection { cell, row in
+				self.logout()
+			}
         
         #if targetEnvironment(macCatalyst)
             if let beepSection = self.form.sectionBy(tag: "BeepRecordSection") {