diff --git a/README.md b/README.md
index d370f04e3..667ef33e3 100644
--- a/README.md
+++ b/README.md
@@ -50,19 +50,19 @@ libraries.
 ```groovy
 dependencies {
     // FirebaseUI for Firebase Realtime Database
-    implementation 'com.firebaseui:firebase-ui-database:4.3.0'
+    implementation 'com.firebaseui:firebase-ui-database:4.3.1'
 
     // FirebaseUI for Cloud Firestore
-    implementation 'com.firebaseui:firebase-ui-firestore:4.3.0'
+    implementation 'com.firebaseui:firebase-ui-firestore:4.3.1'
 
     // FirebaseUI for Firebase Auth
-    implementation 'com.firebaseui:firebase-ui-auth:4.3.0'
+    implementation 'com.firebaseui:firebase-ui-auth:4.3.1'
 
     // FirebaseUI for Firebase Auth (GitHub provider)
-    implementation 'com.firebaseui:firebase-ui-auth-github:4.3.0'
+    implementation 'com.firebaseui:firebase-ui-auth-github:4.3.1'
 
     // FirebaseUI for Cloud Storage
-    implementation 'com.firebaseui:firebase-ui-storage:4.3.0'
+    implementation 'com.firebaseui:firebase-ui-storage:4.3.1'
 }
 ```
 
diff --git a/auth/README.md b/auth/README.md
index f460563a6..801baa6d2 100644
--- a/auth/README.md
+++ b/auth/README.md
@@ -66,10 +66,10 @@ Gradle, add the dependency:
 ```groovy
 dependencies {
     // ...
-    implementation 'com.firebaseui:firebase-ui-auth:4.3.0'
+    implementation 'com.firebaseui:firebase-ui-auth:4.3.1'
 
     // Required only if GitHub OAuth support is required
-    implementation 'com.firebaseui:firebase-ui-auth-github:4.3.0'
+    implementation 'com.firebaseui:firebase-ui-auth-github:4.3.1'
 
     // Required only if Facebook login support is required
     // Find the latest Facebook SDK releases here: https://goo.gl/Ce5L94
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/CheckPhoneNumberFragment.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/CheckPhoneNumberFragment.java
index 6bead64b8..638a0fa6e 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/phone/CheckPhoneNumberFragment.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/phone/CheckPhoneNumberFragment.java
@@ -46,6 +46,7 @@ public class CheckPhoneNumberFragment extends FragmentBase implements View.OnCli
     private TextInputLayout mPhoneInputLayout;
     private EditText mPhoneEditText;
     private TextView mSmsTermsText;
+    private TextView mFooterText;
 
 
     public static CheckPhoneNumberFragment newInstance(Bundle params) {
@@ -81,6 +82,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         mPhoneInputLayout = view.findViewById(R.id.phone_layout);
         mPhoneEditText = view.findViewById(R.id.phone_number);
         mSmsTermsText = view.findViewById(R.id.send_sms_tos);
+        mFooterText = view.findViewById(R.id.email_footer_tos_and_pp_text);
 
         mSmsTermsText.setText(getString(R.string.fui_sms_terms_of_service,
                 getString(R.string.fui_verify_phone_number)));
@@ -97,7 +99,7 @@ public void onDonePressed() {
         });
         mSubmitButton.setOnClickListener(this);
 
-        setupPrivacyDisclosures(view.<TextView>findViewById(R.id.email_footer_tos_and_pp_text));
+        setupPrivacyDisclosures();
         setupCountrySpinner();
     }
 
@@ -171,17 +173,20 @@ private String getPseudoValidPhoneNumber() {
                 everythingElse, mCountryListSpinner.getSelectedCountryInfo());
     }
 
-    private void setupPrivacyDisclosures(TextView footerText) {
+    private void setupPrivacyDisclosures() {
         FlowParameters params = getFlowParams();
 
-        if (!params.shouldShowProviderChoice()) {
+        boolean termsAndPrivacyUrlsProvided = params.isTermsOfServiceUrlProvided()
+                && params.isPrivacyPolicyUrlProvided();
+
+        if (!params.shouldShowProviderChoice() && termsAndPrivacyUrlsProvided) {
             PrivacyDisclosureUtils.setupTermsOfServiceAndPrivacyPolicySmsText(requireContext(),
                     params,
                     mSmsTermsText);
         } else {
             PrivacyDisclosureUtils.setupTermsOfServiceFooter(requireContext(),
                     params,
-                    footerText);
+                    mFooterText);
 
             String verifyText = getString(R.string.fui_verify_phone_number);
             mSmsTermsText.setText(getString(R.string.fui_sms_terms_of_service, verifyText));
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/ui/BaselineTextInputLayout.java b/auth/src/main/java/com/firebase/ui/auth/util/ui/BaselineTextInputLayout.java
new file mode 100644
index 000000000..a1c9fcf0d
--- /dev/null
+++ b/auth/src/main/java/com/firebase/ui/auth/util/ui/BaselineTextInputLayout.java
@@ -0,0 +1,28 @@
+package com.firebase.ui.auth.util.ui;
+
+import android.content.Context;
+import android.support.annotation.RestrictTo;
+import android.support.design.widget.TextInputLayout;
+import android.util.AttributeSet;
+import android.widget.EditText;
+
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+public class BaselineTextInputLayout extends TextInputLayout {
+    public BaselineTextInputLayout(Context context) {
+        super(context);
+    }
+
+    public BaselineTextInputLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public BaselineTextInputLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    public int getBaseline() {
+        EditText text = getEditText();
+        return text == null ? super.getBaseline() : text.getPaddingTop() + text.getBaseline();
+    }
+}
diff --git a/auth/src/main/res/layout/fui_phone_layout.xml b/auth/src/main/res/layout/fui_phone_layout.xml
index 1a2dece45..28cc7f7d2 100644
--- a/auth/src/main/res/layout/fui_phone_layout.xml
+++ b/auth/src/main/res/layout/fui_phone_layout.xml
@@ -25,7 +25,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintBaseline_toBaselineOf="@+id/phone_layout" />
 
-            <android.support.design.widget.TextInputLayout
+            <com.firebase.ui.auth.util.ui.BaselineTextInputLayout
                 android:id="@+id/phone_layout"
                 style="@style/FirebaseUI.TextInputLayout.PhoneField"
                 android:layout_width="0dp"
@@ -39,7 +39,7 @@
                     style="@style/FirebaseUI.TextInputEditText.PhoneField"
                     android:imeOptions="actionDone" />
 
-            </android.support.design.widget.TextInputLayout>
+            </com.firebase.ui.auth.util.ui.BaselineTextInputLayout>
 
             <Button
                 android:id="@+id/send_code"
diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
index 62372d517..98221510a 100644
--- a/buildSrc/src/main/kotlin/Config.kt
+++ b/buildSrc/src/main/kotlin/Config.kt
@@ -1,5 +1,5 @@
 object Config {
-    const val version = "4.3.0"
+    const val version = "4.3.1"
     val submodules = listOf("auth", "auth-github", "common", "firestore", "database", "storage")
 
     private const val kotlinVersion = "1.2.61"