diff --git a/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java b/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java
index 728a3ee22..8a0764319 100644
--- a/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java
+++ b/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java
@@ -29,6 +29,7 @@
 import android.widget.RadioButton;
 
 import com.firebase.ui.auth.AuthUI;
+import com.firebase.ui.auth.ui.ResultCodes;
 import com.firebase.uidemo.R;
 import com.google.firebase.auth.FirebaseAuth;
 
@@ -172,6 +173,11 @@ private void handleSignInResponse(int resultCode, Intent data) {
             return;
         }
 
+        if (resultCode == ResultCodes.RESULT_NO_NETWORK) {
+            showSnackbar(R.string.no_internet_connection);
+            return;
+        }
+
         showSnackbar(R.string.unknown_sign_in_response);
     }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fb3c0dd8e..664a65d50 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -33,6 +33,7 @@
     <string name="ok_label">OK</string>
     <string name="unknown_sign_in_response">Unknown response from AuthUI sign-in</string>
     <string name="sign_in_cancelled">Sign in cancelled</string>
+    <string name="no_internet_connection">No internet connection</string>
     <string name="signed_in_header">You are signed in!</string>
     <string name="sign_out">Sign out</string>
     <string name="delete_account_label">Delete account</string>
diff --git a/auth/src/main/AndroidManifest.xml b/auth/src/main/AndroidManifest.xml
index 27f2dafb9..cafe340f7 100644
--- a/auth/src/main/AndroidManifest.xml
+++ b/auth/src/main/AndroidManifest.xml
@@ -2,6 +2,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.firebase.ui.auth">
 
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
     <application>
 
         <meta-data
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/ChooseAccountActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/ChooseAccountActivity.java
index d062e4df3..11ccfd536 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/ChooseAccountActivity.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/ChooseAccountActivity.java
@@ -17,6 +17,7 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.net.ConnectivityManager;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.text.TextUtils;
@@ -46,6 +47,8 @@
 
 import java.util.List;
 
+import static com.firebase.ui.auth.ui.ResultCodes.RESULT_NO_NETWORK;
+
 /**
  * Attempts to acquire a credential from Smart Lock for Passwords to sign in
  * an existing account. If this succeeds, an attempt is made to sign the user in
@@ -57,6 +60,7 @@
  */
 public class ChooseAccountActivity extends ActivityBase {
     private static final String TAG = "ChooseAccountActivity";
+
     private static final int RC_CREDENTIALS_READ = 2;
     private static final int RC_IDP_SIGNIN = 3;
     private static final int RC_AUTH_METHOD_PICKER = 4;
@@ -70,6 +74,13 @@ public class ChooseAccountActivity extends ActivityBase {
     protected void onCreate(Bundle savedInstance) {
         super.onCreate(savedInstance);
 
+        if (!hasNetworkConnection()) {
+            Log.d(TAG, "No network connection");
+
+            finish(RESULT_NO_NETWORK, new Intent());
+            return;
+        }
+
         // Make Google Play Services available at the correct version, if possible
         mPlayServicesHelper = PlayServicesHelper.getInstance(this);
         boolean madeAvailable = mPlayServicesHelper
@@ -112,6 +123,18 @@ protected void onStop() {
         }
     }
 
+    /**
+     * Check if there is an active or soon-to-be-active network connection.
+     */
+    private boolean hasNetworkConnection() {
+        ConnectivityManager manager =
+                (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
+
+        return manager != null
+                && manager.getActiveNetworkInfo() != null
+                && manager.getActiveNetworkInfo().isConnectedOrConnecting();
+    }
+
     /**
      * Called when the Credentials API connects.
      */
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/ResultCodes.java b/auth/src/main/java/com/firebase/ui/auth/ui/ResultCodes.java
new file mode 100644
index 000000000..afe14a25f
--- /dev/null
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/ResultCodes.java
@@ -0,0 +1,14 @@
+package com.firebase.ui.auth.ui;
+
+import com.firebase.ui.auth.AuthUI;
+
+/**
+ * Result codes returned when using {@link AuthUI.SignInIntentBuilder#build()} with
+ * {@code startActivityForResult}.
+ */
+public class ResultCodes {
+
+    /** Sign in failed due to lack of network connection **/
+    public static final int RESULT_NO_NETWORK = 10;
+
+}
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/account_link/WelcomeBackPasswordPrompt.java b/auth/src/main/java/com/firebase/ui/auth/ui/account_link/WelcomeBackPasswordPrompt.java
index e9574f33d..e52457a81 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/account_link/WelcomeBackPasswordPrompt.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/account_link/WelcomeBackPasswordPrompt.java
@@ -22,6 +22,7 @@
 import android.support.design.widget.TextInputLayout;
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
+import android.text.TextUtils;
 import android.text.style.StyleSpan;
 import android.view.View;
 import android.widget.EditText;
@@ -115,6 +116,14 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
     private void next(String email, final String password) {
         final FirebaseAuth firebaseAuth = mActivityHelper.getFirebaseAuth();
 
+        // Check for null or empty password
+        if (TextUtils.isEmpty(password)) {
+            mPasswordField.setError(getString(R.string.required_field));
+            return;
+        } else {
+            mPasswordField.setError(null);
+        }
+
         // Sign in with known email and the password provided
         firebaseAuth.signInWithEmailAndPassword(email, password)
                 .addOnFailureListener(