diff --git a/MasterPassword/iOS/MPAppDelegate.m b/MasterPassword/iOS/MPAppDelegate.m
index 8298de6d..57bf674f 100644
--- a/MasterPassword/iOS/MPAppDelegate.m
+++ b/MasterPassword/iOS/MPAppDelegate.m
@@ -297,9 +297,6 @@
     inf(@"Re-activated");
     [[MPAppDelegate get] checkConfig];
 
-    if ([[MPiOSConfig get].showQuickStart boolValue])
-        [self showGuide];
-
     [TestFlight passCheckpoint:MPCheckpointActivated];
 
     [super applicationDidBecomeActive:application];
diff --git a/MasterPassword/iOS/MPMainViewController.m b/MasterPassword/iOS/MPMainViewController.m
index 0f47c258..2de8f9f1 100644
--- a/MasterPassword/iOS/MPMainViewController.m
+++ b/MasterPassword/iOS/MPMainViewController.m
@@ -120,9 +120,9 @@
     inf(@"Main will appear.");
     [[UIApplication sharedApplication] setStatusBarHidden:NO withAnimation:animated? UIStatusBarAnimationSlide: UIStatusBarAnimationNone];
 
-    if (![MPAppDelegate get].activeUser)
-        [self.navigationController presentViewController:[self.storyboard instantiateViewControllerWithIdentifier:@"MPUnlockViewController"]
-                                                animated:animated completion:nil];
+    if ([[MPiOSConfig get].showQuickStart boolValue])
+        [[MPAppDelegate get] showGuide];
+
     if (self.activeElement.user != [MPAppDelegate get].activeUser)
         self.activeElement                      = nil;
     self.searchDisplayController.searchBar.text = nil;
@@ -136,6 +136,35 @@
 
     [self updateAnimated:animated];
 
+    [super viewWillAppear:animated];
+}
+
+- (void)viewDidAppear:(BOOL)animated {
+
+    if (![MPAppDelegate get].activeUser)
+        [self.navigationController presentViewController:[self.storyboard instantiateViewControllerWithIdentifier:@"MPUnlockViewController"]
+                                                animated:animated completion:nil];
+
+    if (![[MPiOSConfig get].actionsTipShown boolValue])
+        [UIView animateWithDuration:animated? 0.3f: 0 animations:^{
+            self.actionsTipContainer.alpha = 1;
+        }                completion:^(BOOL finished) {
+            if (finished) {
+                [MPiOSConfig get].actionsTipShown = PearlBool(YES);
+
+                dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5.0f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                    [UIView animateWithDuration:0.2f animations:^{
+                        self.actionsTipContainer.alpha = 0;
+                    }                completion:^(BOOL finished_) {
+                        if (![self.activeElement.name length])
+                            [UIView animateWithDuration:animated? 0.3f: 0 animations:^{
+                                self.searchTipContainer.alpha = 1;
+                            }];
+                    }];
+                });
+            }
+        }];
+
     if ([MPAppDelegate get].activeUser)
         [[MPAppDelegate get].managedObjectContextIfReady performBlock:^void() {
             NSError        *error            = nil;
@@ -163,31 +192,6 @@
 
         }];
 
-    [super viewWillAppear:animated];
-}
-
-- (void)viewDidAppear:(BOOL)animated {
-
-    if (![[MPiOSConfig get].actionsTipShown boolValue])
-        [UIView animateWithDuration:animated? 0.3f: 0 animations:^{
-            self.actionsTipContainer.alpha = 1;
-        }                completion:^(BOOL finished) {
-            if (finished) {
-                [MPiOSConfig get].actionsTipShown = PearlBool(YES);
-
-                dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5.0f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                    [UIView animateWithDuration:0.2f animations:^{
-                        self.actionsTipContainer.alpha = 0;
-                    }                completion:^(BOOL finished_) {
-                        if (![self.activeElement.name length])
-                            [UIView animateWithDuration:animated? 0.3f: 0 animations:^{
-                                self.searchTipContainer.alpha = 1;
-                            }];
-                    }];
-                });
-            }
-        }];
-
     [super viewDidAppear:animated];
 }
 
diff --git a/MasterPassword/iOS/MPUnlockViewController.m b/MasterPassword/iOS/MPUnlockViewController.m
index 715ecc9a..0b836c41 100644
--- a/MasterPassword/iOS/MPUnlockViewController.m
+++ b/MasterPassword/iOS/MPUnlockViewController.m
@@ -194,6 +194,8 @@
 
     if (!animated)
         [[self findTargetedAvatar] setSelected:YES];
+    else
+        [self updateLayoutAnimated:YES allowScroll:YES completion:nil];
 
     [super viewDidAppear:animated];
 }
diff --git a/MasterPassword/iOS/MainStoryboard_iPhone.storyboard b/MasterPassword/iOS/MainStoryboard_iPhone.storyboard
index 9c69f411..8d14e069 100644
--- a/MasterPassword/iOS/MainStoryboard_iPhone.storyboard
+++ b/MasterPassword/iOS/MainStoryboard_iPhone.storyboard
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="2549" systemVersion="12A269" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="KZF-fe-y9n">
     <dependencies>
+        <deployment defaultVersion="1296" identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="1498"/>
     </dependencies>
     <scenes>
@@ -875,6 +876,7 @@ You should upgrade these sites and update their account's passwords as soon as i
                         <color key="backgroundColor" red="0.14901960784313725" green="0.16470588235294117" blue="0.1803921568627451" alpha="1" colorSpace="calibratedRGB"/>
                     </view>
                     <navigationItem key="navigationItem" title="Master Password" id="hB9-S6-KHC">
+                        <barButtonItem key="backBarButtonItem" title="Site" id="tQQ-BA-KkZ"/>
                         <barButtonItem key="rightBarButtonItem" systemItem="action" id="8Y7-Bf-FHa">
                             <connections>
                                 <action selector="action:" destination="PQa-Xl-A3x" id="mhz-Ey-IOC"/>
@@ -1426,7 +1428,6 @@ You could use the word wall for  inspiration in finding a memorable master passw
                         <outlet property="avatarTemplate" destination="Ten-ig-gog" id="0ZZ-z5-d5m"/>
                         <outlet property="avatarsView" destination="Blg-F1-9NA" id="2NL-jU-IMI"/>
                         <outlet property="createPasswordTipView" destination="xWL-xQ-KjX" id="Pa1-Bk-pW2"/>
-                        <outlet property="tip" destination="DBJ-Qi-ZcF" id="VXD-Zc-UYi"/>
                         <outlet property="loadingUsersIndicator" destination="XuP-pi-ygN" id="idh-aH-sDL"/>
                         <outlet property="nameLabel" destination="0NM-NI-7UR" id="GBg-Ry-sqj"/>
                         <outlet property="oldNameLabel" destination="8s0-nT-Aoq" id="plu-1H-MVc"/>
@@ -1437,6 +1438,7 @@ You could use the word wall for  inspiration in finding a memorable master passw
                         <outlet property="passwordView" destination="7cc-yu-i0m" id="WoF-Ab-PPC"/>
                         <outlet property="spinner" destination="27q-lX-0vy" id="CGK-G9-PRI"/>
                         <outlet property="targetedUserActionGesture" destination="9WS-yS-aqQ" id="y74-cg-eat"/>
+                        <outlet property="tip" destination="DBJ-Qi-ZcF" id="VXD-Zc-UYi"/>
                         <outlet property="wordWall" destination="JTj-nh-BWs" id="Mdy-OW-ouS"/>
                     </connections>
                 </viewController>
@@ -1928,7 +1930,6 @@ You could use the word wall for  inspiration in finding a memorable master passw
                 <relationship kind="outlet" name="avatarTemplate" candidateClass="UIButton"/>
                 <relationship kind="outlet" name="avatarsView" candidateClass="UIScrollView"/>
                 <relationship kind="outlet" name="createPasswordTipView" candidateClass="UIView"/>
-                <relationship kind="outlet" name="tip" candidateClass="UILabel"/>
                 <relationship kind="outlet" name="loadingUsersIndicator" candidateClass="UIActivityIndicatorView"/>
                 <relationship kind="outlet" name="nameLabel" candidateClass="UILabel"/>
                 <relationship kind="outlet" name="oldNameLabel" candidateClass="UILabel"/>
@@ -1939,6 +1940,7 @@ You could use the word wall for  inspiration in finding a memorable master passw
                 <relationship kind="outlet" name="passwordView" candidateClass="UIView"/>
                 <relationship kind="outlet" name="spinner" candidateClass="UIImageView"/>
                 <relationship kind="outlet" name="targetedUserActionGesture" candidateClass="UILongPressGestureRecognizer"/>
+                <relationship kind="outlet" name="tip" candidateClass="UILabel"/>
                 <relationship kind="outlet" name="wordWall" candidateClass="UIView"/>
             </relationships>
         </class>
@@ -1949,6 +1951,6 @@ You could use the word wall for  inspiration in finding a memorable master passw
         <simulatedScreenMetrics key="destination"/>
     </simulatedMetricsContainer>
     <inferredMetricsTieBreakers>
-        <segue reference="9Bs-cD-ddF"/>
+        <segue reference="KIl-ZW-M7G"/>
     </inferredMetricsTieBreakers>
-</document>
+</document>
\ No newline at end of file