diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec
index b5e439ca1..37221cd92 100644
--- a/WordPressAuthenticator.podspec
+++ b/WordPressAuthenticator.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = "WordPressAuthenticator"
-  s.version       = "1.11.0"
+  s.version       = "1.11.2-beta.1"
   s.summary       = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps."
 
   s.description   = <<-DESC
diff --git a/WordPressAuthenticator/Authenticator/WordPressAuthenticator.swift b/WordPressAuthenticator/Authenticator/WordPressAuthenticator.swift
index f378ca7a9..9e20f0fb5 100644
--- a/WordPressAuthenticator/Authenticator/WordPressAuthenticator.swift
+++ b/WordPressAuthenticator/Authenticator/WordPressAuthenticator.swift
@@ -269,7 +269,7 @@ import AuthenticationServices
             return false
         }
 
-        let storyboard = UIStoryboard(name: "EmailMagicLink", bundle: bundle)
+        let storyboard = Storyboard.emailMagicLink.instance
         guard let loginController = storyboard.instantiateViewController(withIdentifier: "LinkAuthView") as? NUXLinkAuthViewController else {
             DDLogInfo("App opened with authentication link but couldn't create login screen.")
             return false
diff --git a/WordPressAuthenticator/Extensions/UIStoryboard+Helpers.swift b/WordPressAuthenticator/Extensions/UIStoryboard+Helpers.swift
index bf17b5b1d..7e362985b 100644
--- a/WordPressAuthenticator/Extensions/UIStoryboard+Helpers.swift
+++ b/WordPressAuthenticator/Extensions/UIStoryboard+Helpers.swift
@@ -3,11 +3,12 @@ import Foundation
 
 // MARK - Storyboard enum
 enum Storyboard: String {
-    case login
-    case signup
+    case login = "Login"
+    case signup = "Signup"
+    case emailMagicLink = "EmailMagicLink"
 
     var instance: UIStoryboard {
-        return UIStoryboard(name: self.rawValue.capitalized, bundle: WordPressAuthenticator.bundle)
+        return UIStoryboard(name: self.rawValue, bundle: WordPressAuthenticator.bundle)
     }
 
     /// Returns a view controller from a Storyboard
diff --git a/WordPressAuthenticator/NUX/NUXViewController.swift b/WordPressAuthenticator/NUX/NUXViewController.swift
index c39426c18..468cd584b 100644
--- a/WordPressAuthenticator/NUX/NUXViewController.swift
+++ b/WordPressAuthenticator/NUX/NUXViewController.swift
@@ -34,7 +34,6 @@ open class NUXViewController: UIViewController, NUXViewControllerBase, UIViewCon
         case showWPComLogin
         case startMagicLinkFlow
         case showMagicLink
-        case showLinkMailView
         case show2FA
         case showDomains
         case showCreateSite
diff --git a/WordPressAuthenticator/Signin/EmailMagicLink.storyboard b/WordPressAuthenticator/Signin/EmailMagicLink.storyboard
index 976e00ad5..d49c77d07 100644
--- a/WordPressAuthenticator/Signin/EmailMagicLink.storyboard
+++ b/WordPressAuthenticator/Signin/EmailMagicLink.storyboard
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
-        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -52,7 +49,7 @@
         <!--Link Mail View Controller-->
         <scene sceneID="zhV-IL-bW4">
             <objects>
-                <viewController storyboardIdentifier="LinkMailView" extendedLayoutIncludesOpaqueBars="YES" useStoryboardIdentifierAsRestorationIdentifier="YES" id="GSd-vy-rpZ" customClass="NUXLinkMailViewController" customModule="WordPressAuthenticator" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="NUXLinkMailViewController" extendedLayoutIncludesOpaqueBars="YES" useStoryboardIdentifierAsRestorationIdentifier="YES" id="GSd-vy-rpZ" customClass="NUXLinkMailViewController" customModule="WordPressAuthenticator" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="s8Z-uG-nj5"/>
                         <viewControllerLayoutGuide type="bottom" id="vKK-Mm-0yR"/>
@@ -91,7 +88,7 @@
                                             </mask>
                                         </variation>
                                     </label>
-                                    <button opaque="NO" contentMode="scaleToFill" verticalCompressionResistancePriority="749" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0Iy-9H-ykD" customClass="NUXButton" customModule="WordPressAuthenticator" >
+                                    <button opaque="NO" contentMode="scaleToFill" verticalCompressionResistancePriority="749" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0Iy-9H-ykD" customClass="NUXButton" customModule="WordPressAuthenticator">
                                         <rect key="frame" x="114" y="306.5" width="75" height="34"/>
                                         <constraints>
                                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="34" id="tyz-kt-Arb"/>
@@ -122,7 +119,7 @@
                                     </mask>
                                 </variation>
                             </stackView>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="b0O-LO-6ax" customClass="SubheadlineButton" customModule="WordPressAuthenticator" >
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="b0O-LO-6ax" customClass="SubheadlineButton" customModule="WordPressAuthenticator">
                                 <rect key="frame" x="0.0" y="617" width="375" height="30"/>
                                 <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
                                 <state key="normal" title="Enter your password instead">
diff --git a/WordPressAuthenticator/Signin/Login.storyboard b/WordPressAuthenticator/Signin/Login.storyboard
index 64617b607..30f32eded 100644
--- a/WordPressAuthenticator/Signin/Login.storyboard
+++ b/WordPressAuthenticator/Signin/Login.storyboard
@@ -1020,7 +1020,6 @@
                         <outlet property="label" destination="CmN-ir-1YK" id="Xhc-3L-kvy"/>
                         <outlet property="sendLinkButton" destination="iIy-Sm-1r0" id="9My-fJ-l9S"/>
                         <outlet property="usePasswordButton" destination="B6x-b7-hU9" id="mB8-03-VBa"/>
-                        <segue destination="Aii-0z-zLC" kind="show" identifier="showLinkMailView" id="xs3-qG-RaP"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="cja-vu-y88" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -1183,14 +1182,6 @@
             </objects>
             <point key="canvasLocation" x="794" y="1179"/>
         </scene>
-        <!--LinkMailView-->
-        <scene sceneID="UUd-M2-Fvg">
-            <objects>
-                <viewControllerPlaceholder storyboardIdentifier="LinkMailView" storyboardName="EmailMagicLink" referencedIdentifier="LinkMailView" id="Aii-0z-zLC" sceneMemberID="viewController"/>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="WTT-3e-E71" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="3355" y="255"/>
-        </scene>
         <!--Login Username Password View Controller-->
         <scene sceneID="b9v-Sc-w6J">
             <objects>
@@ -1471,7 +1462,7 @@
         <segue reference="N3P-wt-Rn3"/>
         <segue reference="Njv-lY-Lyi"/>
         <segue reference="2Of-BA-xqb"/>
-        <segue reference="UV4-XI-c0q"/>
+        <segue reference="0ao-yi-yZI"/>
         <segue reference="4SK-mG-U33"/>
         <segue reference="nCA-u7-fKm"/>
         <segue reference="swV-lc-6gI"/>
diff --git a/WordPressAuthenticator/Signin/LoginLinkRequestViewController.swift b/WordPressAuthenticator/Signin/LoginLinkRequestViewController.swift
index e7a58d181..faf8f33bd 100644
--- a/WordPressAuthenticator/Signin/LoginLinkRequestViewController.swift
+++ b/WordPressAuthenticator/Signin/LoginLinkRequestViewController.swift
@@ -139,7 +139,15 @@ class LoginLinkRequestViewController: LoginViewController {
     @objc func didRequestAuthenticationLink() {
         WordPressAuthenticator.track(.loginMagicLinkRequested)
         WordPressAuthenticator.storeLoginInfoForTokenAuth(loginFields)
-        performSegue(withIdentifier: .showLinkMailView, sender: self)
+
+        guard let vc = NUXLinkMailViewController.instantiate(from: .emailMagicLink) else {
+            DDLogError("Failed to navigate to NUXLinkMailViewController")
+            return
+        }
+
+        vc.loginFields = self.loginFields
+        vc.loginFields.restrictToWPCom = true
+        navigationController?.pushViewController(vc, animated: true)
     }
 
     @IBAction func handleUsePasswordTapped(_ sender: UIButton) {
diff --git a/WordPressAuthenticator/Signup/Signup.storyboard b/WordPressAuthenticator/Signup/Signup.storyboard
index efb155016..db447d9fb 100644
--- a/WordPressAuthenticator/Signup/Signup.storyboard
+++ b/WordPressAuthenticator/Signup/Signup.storyboard
@@ -128,7 +128,6 @@
                         <outlet property="errorLabel" destination="EYw-oM-W1K" id="P2j-f2-bLo"/>
                         <outlet property="instructionLabel" destination="CPF-7g-0y5" id="Urr-Xa-YNp"/>
                         <outlet property="submitButton" destination="4Su-Zc-Omp" id="amJ-9P-tcO"/>
-                        <segue destination="Je3-5O-NYu" kind="show" identifier="showLinkMailView" id="Yop-RV-xJa"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="OAN-7g-PQl" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -179,14 +178,6 @@
             </objects>
             <point key="canvasLocation" x="-938" y="791"/>
         </scene>
-        <!--LinkMailView-->
-        <scene sceneID="lKY-0n-z5h">
-            <objects>
-                <viewControllerPlaceholder storyboardIdentifier="LinkMailView" storyboardName="EmailMagicLink" referencedIdentifier="LinkMailView" id="Je3-5O-NYu" sceneMemberID="viewController"/>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="DAI-Ik-KtV" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="-358" y="190"/>
-        </scene>
     </scenes>
     <resources>
         <image name="icon-username-field" width="18" height="18"/>
diff --git a/WordPressAuthenticator/Signup/SignupEmailViewController.swift b/WordPressAuthenticator/Signup/SignupEmailViewController.swift
index 94faf75a3..d0cb58687 100644
--- a/WordPressAuthenticator/Signup/SignupEmailViewController.swift
+++ b/WordPressAuthenticator/Signup/SignupEmailViewController.swift
@@ -183,15 +183,6 @@ class SignupEmailViewController: LoginViewController, NUXKeyboardResponder {
         })
     }
 
-    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
-        super.prepare(for: segue, sender: sender)
-        // Configure login flow to allow only .com login and prefill the email
-        if let destination = segue.destination as? LoginEmailViewController {
-            destination.loginFields.restrictToWPCom = true
-            destination.loginFields.username = loginFields.emailAddress
-        }
-    }
-
     // MARK: - Send email
 
     /// Makes the call to request a magic signup link be emailed to the user.
@@ -217,7 +208,16 @@ class SignupEmailViewController: LoginViewController, NUXKeyboardResponder {
     private func didRequestSignupLink() {
         WordPressAuthenticator.track(.signupMagicLinkRequested)
         WordPressAuthenticator.storeLoginInfoForTokenAuth(loginFields)
-        performSegue(withIdentifier: "showLinkMailView", sender: nil)
+
+        guard let vc = NUXLinkMailViewController.instantiate(from: .emailMagicLink) else {
+            DDLogError("Failed to navigate to NUXLinkMailViewController")
+            return
+        }
+
+        vc.loginFields = loginFields
+        vc.loginFields.restrictToWPCom = true
+
+        navigationController?.pushViewController(vc, animated: true)
     }
 
     // MARK: - Action Handling