diff --git a/EmailAuth/FirebaseEmailAuthUI/Resources/FUIPasswordSignInViewController.xib b/EmailAuth/FirebaseEmailAuthUI/Resources/FUIPasswordSignInViewController.xib
index c75b845a396..1567c2f146c 100644
--- a/EmailAuth/FirebaseEmailAuthUI/Resources/FUIPasswordSignInViewController.xib
+++ b/EmailAuth/FirebaseEmailAuthUI/Resources/FUIPasswordSignInViewController.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -30,7 +30,7 @@
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="top" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6Y9-ZQ-dJB">
-                                <rect key="frame" x="130" y="15" width="115" height="15"/>
+                                <rect key="frame" x="0.0" y="15" width="375" height="27"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                 <state key="normal" title="Trouble signing in?"/>
                                 <connections>
@@ -38,7 +38,7 @@
                                 </connections>
                             </button>
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" verticalCompressionResistancePriority="1000" editable="NO" text="Terms of Service" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="aQs-HQ-6lQ" customClass="FUIPrivacyAndTermsOfServiceView">
-                                <rect key="frame" x="0.0" y="37" width="375" height="39"/>
+                                <rect key="frame" x="0.0" y="49" width="375" height="27"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
@@ -46,11 +46,11 @@
                         </subviews>
                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                         <constraints>
-                            <constraint firstAttribute="trailing" secondItem="6Y9-ZQ-dJB" secondAttribute="trailing" constant="130" id="9wq-Av-A0o" userLabel="trailing = Forgot Password Button.trailing"/>
+                            <constraint firstAttribute="trailing" secondItem="6Y9-ZQ-dJB" secondAttribute="trailing" id="9wq-Av-A0o" userLabel="trailing = Forgot Password Button.trailing"/>
                             <constraint firstItem="aQs-HQ-6lQ" firstAttribute="leading" secondItem="OJW-RE-fac" secondAttribute="leading" id="NMe-Cu-8QK"/>
                             <constraint firstAttribute="trailing" secondItem="aQs-HQ-6lQ" secondAttribute="trailing" id="Oal-8w-YP8"/>
                             <constraint firstItem="6Y9-ZQ-dJB" firstAttribute="top" secondItem="OJW-RE-fac" secondAttribute="top" constant="15" id="Rix-Qr-wa7" userLabel="Forgot Password Button.top = top"/>
-                            <constraint firstItem="6Y9-ZQ-dJB" firstAttribute="leading" secondItem="OJW-RE-fac" secondAttribute="leading" constant="130" id="SV1-7o-b14" userLabel="Forgot Password Button.leading = leading"/>
+                            <constraint firstItem="6Y9-ZQ-dJB" firstAttribute="leading" secondItem="OJW-RE-fac" secondAttribute="leading" id="SV1-7o-b14" userLabel="Forgot Password Button.leading = leading"/>
                             <constraint firstItem="aQs-HQ-6lQ" firstAttribute="top" secondItem="6Y9-ZQ-dJB" secondAttribute="bottom" constant="7" id="djY-3a-0BM" userLabel="Terms Of Service View.top = Forgot Password Button.bottom"/>
                             <constraint firstAttribute="bottom" secondItem="aQs-HQ-6lQ" secondAttribute="bottom" id="kJm-07-Pxy"/>
                         </constraints>