diff --git a/MasterPassword/iOS/MPMainViewController.m b/MasterPassword/iOS/MPMainViewController.m
index 1479d990..72522cda 100644
--- a/MasterPassword/iOS/MPMainViewController.m
+++ b/MasterPassword/iOS/MPMainViewController.m
@@ -67,8 +67,8 @@
 }
 
 - (void)viewWillAppear:(BOOL)animated {
-
-    [super viewWillAppear:animated];
+    
+    [[UIApplication sharedApplication] setStatusBarHidden:NO withAnimation:animated? UIStatusBarAnimationSlide: UIStatusBarAnimationNone];
 
     if (![MPAppDelegate get].activeUser)
         [self.navigationController presentViewController:[self.storyboard instantiateViewControllerWithIdentifier:@"MPUnlockViewController"]
@@ -83,6 +83,8 @@
 
     [self setHelpHidden:[[MPiOSConfig get].helpHidden boolValue] animated:animated];
     [self updateAnimated:animated];
+    
+    [super viewWillAppear:animated];
 }
 
 - (void)viewDidAppear:(BOOL)animated {
diff --git a/MasterPassword/iOS/MPPreferencesViewController.m b/MasterPassword/iOS/MPPreferencesViewController.m
index aebf7921..af906138 100644
--- a/MasterPassword/iOS/MPPreferencesViewController.m
+++ b/MasterPassword/iOS/MPPreferencesViewController.m
@@ -153,7 +153,10 @@
 
 - (IBAction)settings:(UIBarButtonItem *)sender {
     
-    [self.navigationController pushViewController:[IASKAppSettingsViewController new] animated:YES];
+    IASKAppSettingsViewController *vc = [IASKAppSettingsViewController new];
+    vc.showDoneButton = NO;
+    
+    [self.navigationController pushViewController:vc animated:YES];
 }
 
 @end
diff --git a/MasterPassword/iOS/MPTypeViewController.m b/MasterPassword/iOS/MPTypeViewController.m
index 97ccf3e8..050a06e9 100644
--- a/MasterPassword/iOS/MPTypeViewController.m
+++ b/MasterPassword/iOS/MPTypeViewController.m
@@ -94,6 +94,8 @@
                     return MPElementTypeGeneratedBasic;
                 case 6:
                     return MPElementTypeGeneratedPIN;
+                case 7:
+                    return NSNotFound;
 
                 default:
                     Throw(@"Unsupported row: %d, when selecting generated element type.", indexPath.row);
@@ -109,6 +111,8 @@
                     return MPElementTypeStoredPersonal;
                 case 2:
                     return MPElementTypeStoredDevicePrivate;
+                case 3:
+                    return NSNotFound;
 
                 default:
                     Throw(@"Unsupported row: %d, when selecting stored element type.", indexPath.row);
diff --git a/MasterPassword/iOS/MPUnlockViewController.m b/MasterPassword/iOS/MPUnlockViewController.m
index 6452367e..ce71b903 100644
--- a/MasterPassword/iOS/MPUnlockViewController.m
+++ b/MasterPassword/iOS/MPUnlockViewController.m
@@ -157,8 +157,6 @@
 
 - (void)viewWillDisappear:(BOOL)animated {
 
-    [[UIApplication sharedApplication] setStatusBarHidden:NO withAnimation:animated? UIStatusBarAnimationSlide: UIStatusBarAnimationNone];
-
     [super viewWillDisappear:animated];
 }
 
diff --git a/MasterPassword/iOS/Settings.bundle/Root.plist b/MasterPassword/iOS/Settings.bundle/Root.plist
index af9e4cb4..8cf3410a 100644
--- a/MasterPassword/iOS/Settings.bundle/Root.plist
+++ b/MasterPassword/iOS/Settings.bundle/Root.plist
@@ -70,14 +70,6 @@
 			<key>Type</key>
 			<string>PSToggleSwitchSpecifier</string>
 		</dict>
-		<dict>
-			<key>FooterText</key>
-			<string>Use this to save your master password in the key chain.  This is somewhat less secure should your device get stolen, but it means you won&apos;t need to enter the master password anymore.  You can compensate for the reduced security by going into General-&gt;Passcode Lock, disabling &quot;Simple Passcode&quot;, and setting a more secure passcode for your device.</string>
-			<key>Title</key>
-			<string></string>
-			<key>Type</key>
-			<string>PSGroupSpecifier</string>
-		</dict>
 		<dict>
 			<key>Type</key>
 			<string>PSGroupSpecifier</string>