diff --git a/auth/src/main/AndroidManifest.xml b/auth/src/main/AndroidManifest.xml
index cec5875b2..132ced9f4 100644
--- a/auth/src/main/AndroidManifest.xml
+++ b/auth/src/main/AndroidManifest.xml
@@ -37,12 +37,6 @@
             android:exported="false"
             android:theme="@style/FirebaseUI"/>
 
-        <activity
-            android:name=".ui.email.SignInActivity"
-            android:label="@string/title_sign_in_activity"
-            android:exported="false"
-            android:theme="@style/FirebaseUI"/>
-
         <activity
             android:name=".ui.accountlink.WelcomeBackIdpPrompt"
             android:label="@string/title_welcome_back_idp_prompt"
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/ActivityHelper.java b/auth/src/main/java/com/firebase/ui/auth/ui/ActivityHelper.java
index ddfaa2795..4484f8315 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/ActivityHelper.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/ActivityHelper.java
@@ -53,4 +53,11 @@ public void saveCredentialsOrFinish(
             IdpResponse response) {
         saveCredentialsOrFinish(saveSmartLock, mActivity, firebaseUser, password, response);
     }
+
+    public void saveCredentialsOrFinish(
+            @Nullable SaveSmartLock saveSmartLock,
+            FirebaseUser firebaseUser,
+            IdpResponse response) {
+        saveCredentialsOrFinish(saveSmartLock, mActivity, firebaseUser, null, response);
+    }
 }
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/BaseHelper.java b/auth/src/main/java/com/firebase/ui/auth/ui/BaseHelper.java
index f0fd80df1..704b25f5c 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/BaseHelper.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/BaseHelper.java
@@ -59,10 +59,6 @@ public boolean isProgressDialogShowing() {
         return mProgressDialog != null && mProgressDialog.isShowing();
     }
 
-    public Context getApplicationContext() {
-        return mContext.getApplicationContext();
-    }
-
     public String getAppName() {
         return mFlowParams.appName;
     }
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java b/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java
index 6d9d96b28..6d205c7dd 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java
@@ -26,6 +26,7 @@
 import android.text.TextUtils;
 import android.text.style.StyleSpan;
 import android.view.View;
+import android.view.WindowManager;
 import android.widget.EditText;
 import android.widget.TextView;
 
@@ -44,6 +45,7 @@
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.AuthResult;
+import com.google.firebase.auth.EmailAuthProvider;
 import com.google.firebase.auth.FirebaseAuth;
 
 /**
@@ -65,13 +67,17 @@ public class WelcomeBackPasswordPrompt extends AppCompatBase implements View.OnC
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.welcome_back_password_prompt_layout);
-        mSaveSmartLock = mActivityHelper.getSaveSmartLockInstance();
-        mPasswordLayout = (TextInputLayout) findViewById(R.id.password_layout);
-        mPasswordField = (EditText) findViewById(R.id.password);
 
+        // Show keyboard
+        getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
+
+        mSaveSmartLock = mActivityHelper.getSaveSmartLockInstance();
         mIdpResponse = IdpResponse.fromResultIntent(getIntent());
         mEmail = mIdpResponse.getEmail();
 
+        mPasswordLayout = (TextInputLayout) findViewById(R.id.password_layout);
+        mPasswordField = (EditText) findViewById(R.id.password);
+
         // Create welcome back text with email bolded
         String bodyText = getResources().getString(R.string.welcome_back_password_prompt_body);
         bodyText = String.format(bodyText, mEmail);
@@ -94,7 +100,6 @@ protected void onCreate(Bundle savedInstanceState) {
     public void onClick(View view) {
         final int id = view.getId();
         if (id == R.id.button_done) {
-            mActivityHelper.showLoadingDialog(R.string.progress_dialog_signing_in);
             next(mEmail, mPasswordField.getText().toString());
         } else if (id == R.id.trouble_signing_in) {
             startActivity(RecoverPasswordActivity.createIntent(
@@ -108,11 +113,12 @@ public void onClick(View view) {
     private void next(final String email, final String password) {
         // Check for null or empty password
         if (TextUtils.isEmpty(password)) {
-            mPasswordField.setError(getString(R.string.required_field));
+            mPasswordLayout.setError(getString(R.string.required_field));
             return;
         } else {
-            mPasswordField.setError(null);
+            mPasswordLayout.setError(null);
         }
+        mActivityHelper.showLoadingDialog(R.string.progress_dialog_signing_in);
 
         final FirebaseAuth firebaseAuth = mActivityHelper.getFirebaseAuth();
         // Sign in with known email and the password provided
@@ -122,29 +128,32 @@ private void next(final String email, final String password) {
                 .addOnSuccessListener(new OnSuccessListener<AuthResult>() {
                     @Override
                     public void onSuccess(AuthResult authResult) {
-                        // Get the social AuthCredential from the IDPResponse object, link
-                        // it to the email/password account.
                         AuthCredential authCredential =
                                 AuthCredentialHelper.getAuthCredential(mIdpResponse);
-                        authResult.getUser().linkWithCredential(authCredential);
-                        firebaseAuth.signOut();
-
-                        // Sign in with the credential
-                        firebaseAuth.signInWithCredential(authCredential)
-                                .addOnFailureListener(
-                                        new TaskFailureLogger(TAG,
-                                                              "Error signing in with credential"))
-                                .addOnSuccessListener(
-                                        new OnSuccessListener<AuthResult>() {
-                                            @Override
-                                            public void onSuccess(AuthResult authResult) {
-                                                mActivityHelper.saveCredentialsOrFinish(
-                                                        mSaveSmartLock,
-                                                        authResult.getUser(),
-                                                        password,
-                                                        mIdpResponse);
-                                            }
-                                        });
+
+                        // If authCredential is null, the user only has an email account.
+                        // Otherwise, the user has an email account that we need to link to an idp.
+                        if (authCredential == null) {
+                            mActivityHelper.saveCredentialsOrFinish(
+                                    mSaveSmartLock,
+                                    authResult.getUser(),
+                                    password,
+                                    new IdpResponse(EmailAuthProvider.PROVIDER_ID, email));
+                        } else {
+                            authResult.getUser()
+                                    .linkWithCredential(authCredential)
+                                    .addOnFailureListener(new TaskFailureLogger(
+                                            TAG, "Error signing in with credential"))
+                                    .addOnSuccessListener(new OnSuccessListener<AuthResult>() {
+                                        @Override
+                                        public void onSuccess(AuthResult authResult) {
+                                            mActivityHelper.saveCredentialsOrFinish(
+                                                    mSaveSmartLock,
+                                                    authResult.getUser(),
+                                                    mIdpResponse);
+                                        }
+                                    });
+                        }
                     }
                 })
                 .addOnFailureListener(this, new OnFailureListener() {
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoverPasswordActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoverPasswordActivity.java
index 5962e4d91..1e8a3e649 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoverPasswordActivity.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoverPasswordActivity.java
@@ -31,7 +31,6 @@
 import com.firebase.ui.auth.ui.email.fieldvalidators.EmailFieldValidator;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
-import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseAuthInvalidUserException;
 
 /**
@@ -47,12 +46,12 @@ public class RecoverPasswordActivity extends AppCompatBase implements View.OnCli
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.forgot_password_layout);
-        String email = getIntent().getStringExtra(ExtraConstants.EXTRA_EMAIL);
-
-        mEmailFieldValidator = new EmailFieldValidator(
-                (TextInputLayout) findViewById(R.id.email_layout));
 
+        mEmailFieldValidator =
+                new EmailFieldValidator((TextInputLayout) findViewById(R.id.email_layout));
         mEmailEditText = (EditText) findViewById(R.id.email);
+
+        String email = getIntent().getStringExtra(ExtraConstants.EXTRA_EMAIL);
         if (email != null) {
             mEmailEditText.setText(email);
         }
@@ -61,8 +60,8 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     private void next(final String email) {
-        FirebaseAuth firebaseAuth = mActivityHelper.getFirebaseAuth();
-        firebaseAuth.sendPasswordResetEmail(email)
+        mActivityHelper.getFirebaseAuth()
+                .sendPasswordResetEmail(email)
                 .addOnFailureListener(
                         new TaskFailureLogger(TAG, "Error sending password reset email"))
                 .addOnSuccessListener(new OnSuccessListener<Void>() {
@@ -89,11 +88,10 @@ public void onFailure(@NonNull Exception e) {
     @Override
     public void onClick(View view) {
         if (view.getId() == R.id.button_done) {
-            if (!mEmailFieldValidator.validate(mEmailEditText.getText())) {
-                return;
+            if (mEmailFieldValidator.validate(mEmailEditText.getText())) {
+                mActivityHelper.showLoadingDialog(R.string.progress_dialog_sending);
+                next(mEmailEditText.getText().toString());
             }
-            mActivityHelper.showLoadingDialog(R.string.progress_dialog_sending);
-            next(mEmailEditText.getText().toString());
         }
     }
 
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailActivity.java
index e200743ba..44ea4d187 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailActivity.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailActivity.java
@@ -43,6 +43,7 @@
 import com.firebase.ui.auth.ui.FlowParameters;
 import com.firebase.ui.auth.ui.TaskFailureLogger;
 import com.firebase.ui.auth.ui.accountlink.WelcomeBackIdpPrompt;
+import com.firebase.ui.auth.ui.accountlink.WelcomeBackPasswordPrompt;
 import com.firebase.ui.auth.ui.email.fieldvalidators.EmailFieldValidator;
 import com.firebase.ui.auth.ui.email.fieldvalidators.PasswordFieldValidator;
 import com.firebase.ui.auth.ui.email.fieldvalidators.RequiredFieldValidator;
@@ -249,12 +250,13 @@ public void onSuccess(ProviderQueryResult result) {
 
                                 String provider = providers.get(0);
                                 if (provider.equalsIgnoreCase(EmailAuthProvider.PROVIDER_ID)) {
-                                    Intent signInIntent = SignInActivity.createIntent(
-                                            RegisterEmailActivity.this,
-                                            mActivityHelper.getFlowParams(),
-                                            email);
-                                    mActivityHelper.startActivityForResult(signInIntent,
-                                                                           RC_SIGN_IN);
+                                    mActivityHelper.startActivityForResult(
+                                            WelcomeBackPasswordPrompt.createIntent(
+                                                    RegisterEmailActivity.this,
+                                                    mActivityHelper.getFlowParams(),
+                                                    new IdpResponse(EmailAuthProvider.PROVIDER_ID,
+                                                                    email)),
+                                            RC_SIGN_IN);
                                 } else {
                                     Intent intent = WelcomeBackIdpPrompt.createIntent(
                                             RegisterEmailActivity.this,
@@ -313,8 +315,7 @@ public void onComplete(@NonNull Task<Void> task) {
                                                 mSaveSmartLock,
                                                 user,
                                                 password,
-                                                new IdpResponse(EmailAuthProvider.PROVIDER_ID,
-                                                                email));
+                                                new IdpResponse(EmailAuthProvider.PROVIDER_ID, email));
                                     }
                                 });
                     }
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/SignInActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/SignInActivity.java
deleted file mode 100644
index 48b3e521b..000000000
--- a/auth/src/main/java/com/firebase/ui/auth/ui/email/SignInActivity.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.firebase.ui.auth.ui.email;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TextInputLayout;
-import android.view.View;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.TextView;
-
-import com.firebase.ui.auth.IdpResponse;
-import com.firebase.ui.auth.R;
-import com.firebase.ui.auth.ui.AppCompatBase;
-import com.firebase.ui.auth.ui.BaseHelper;
-import com.firebase.ui.auth.ui.ExtraConstants;
-import com.firebase.ui.auth.ui.FlowParameters;
-import com.firebase.ui.auth.ui.TaskFailureLogger;
-import com.firebase.ui.auth.ui.email.fieldvalidators.EmailFieldValidator;
-import com.firebase.ui.auth.ui.email.fieldvalidators.RequiredFieldValidator;
-import com.firebase.ui.auth.util.signincontainer.SaveSmartLock;
-import com.google.android.gms.tasks.OnFailureListener;
-import com.google.android.gms.tasks.OnSuccessListener;
-import com.google.firebase.auth.AuthResult;
-import com.google.firebase.auth.EmailAuthProvider;
-
-/**
- * Activity to sign in with email and password.
- */
-public class SignInActivity extends AppCompatBase implements View.OnClickListener {
-    private static final String TAG = "SignInActivity";
-
-    private EditText mEmailEditText;
-    private EditText mPasswordEditText;
-    private EmailFieldValidator mEmailValidator;
-    private RequiredFieldValidator mPasswordValidator;
-    @Nullable
-    private SaveSmartLock mSaveSmartLock;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.sign_in_layout);
-
-        mSaveSmartLock = mActivityHelper.getSaveSmartLockInstance();
-
-        mEmailEditText = (EditText) findViewById(R.id.email);
-        mPasswordEditText = (EditText) findViewById(R.id.password);
-        mEmailValidator = new EmailFieldValidator((TextInputLayout) findViewById(R.id.email_layout));
-        mPasswordValidator = new RequiredFieldValidator((TextInputLayout) findViewById(R.id.password_layout));
-
-        String email = getIntent().getStringExtra(ExtraConstants.EXTRA_EMAIL);
-        if (email != null) {
-            mEmailEditText.setText(email);
-        }
-        Button signInButton = (Button) findViewById(R.id.button_done);
-        TextView recoveryButton = (TextView) findViewById(R.id.trouble_signing_in);
-        signInButton.setOnClickListener(this);
-        recoveryButton.setOnClickListener(this);
-    }
-
-    private void signIn(final String email, final String password) {
-        mActivityHelper.getFirebaseAuth()
-                .signInWithEmailAndPassword(email, password)
-                .addOnFailureListener(
-                        new TaskFailureLogger(TAG, "Error signing in with email and password"))
-                .addOnSuccessListener(new OnSuccessListener<AuthResult>() {
-                    @Override
-                    public void onSuccess(AuthResult authResult) {
-                        // Save credential in SmartLock (if enabled)
-                        mActivityHelper.saveCredentialsOrFinish(
-                                mSaveSmartLock,
-                                authResult.getUser(),
-                                password,
-                                new IdpResponse(EmailAuthProvider.PROVIDER_ID, email));
-                    }
-                })
-                .addOnFailureListener(new OnFailureListener() {
-                    @Override
-                    public void onFailure(@NonNull Exception e) {
-                        mActivityHelper.dismissDialog();
-
-                        // Show error message
-                        TextInputLayout passwordInput =
-                                (TextInputLayout) findViewById(R.id.password_layout);
-                        passwordInput.setError(getString(R.string.login_error));
-                    }
-                });
-    }
-
-    @Override
-    public void onClick(View view) {
-        if (view.getId() == R.id.button_done) {
-            boolean emailValid = mEmailValidator.validate(mEmailEditText.getText());
-            boolean passwordValid = mPasswordValidator.validate(mPasswordEditText.getText());
-            if (emailValid && passwordValid) {
-                mActivityHelper.showLoadingDialog(R.string.progress_dialog_signing_in);
-                signIn(mEmailEditText.getText().toString(), mPasswordEditText.getText().toString());
-            }
-        } else if (view.getId() == R.id.trouble_signing_in) {
-            startActivity(RecoverPasswordActivity.createIntent(
-                    this,
-                    mActivityHelper.getFlowParams(),
-                    mEmailEditText.getText().toString()));
-        }
-    }
-
-    public static Intent createIntent(
-            Context context,
-            FlowParameters flowParams,
-            String email) {
-        return BaseHelper.createBaseIntent(context, SignInActivity.class, flowParams)
-                .putExtra(ExtraConstants.EXTRA_EMAIL, email);
-    }
-}
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java
index dbb73fe18..5d64d7023 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java
@@ -42,7 +42,6 @@
 import com.firebase.ui.auth.util.signincontainer.SaveSmartLock;
 import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.FacebookAuthProvider;
-import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.GoogleAuthProvider;
 import com.google.firebase.auth.TwitterAuthProvider;
 
@@ -159,9 +158,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
     @Override
     public void onSuccess(final IdpResponse response) {
         AuthCredential credential = AuthCredentialHelper.getAuthCredential(response);
-        final FirebaseAuth firebaseAuth = mActivityHelper.getFirebaseAuth();
-
-        firebaseAuth
+        mActivityHelper.getFirebaseAuth()
                 .signInWithCredential(credential)
                 .addOnFailureListener(
                         new TaskFailureLogger(TAG, "Firebase sign in with credential unsuccessful"))
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java b/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java
index a946c6f82..deda59510 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java
@@ -31,7 +31,6 @@
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.EmailAuthProvider;
-import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseAuthUserCollisionException;
 import com.google.firebase.auth.FirebaseUser;
 import com.google.firebase.auth.ProviderQueryResult;
@@ -70,8 +69,8 @@ public void onComplete(@NonNull Task<AuthResult> task) {
         } else {
             if (task.getException() instanceof FirebaseAuthUserCollisionException) {
                 final String email = mResponse.getEmail();
-                FirebaseAuth firebaseAuth = mHelper.getFirebaseAuth();
-                firebaseAuth.fetchProvidersForEmail(email)
+                mHelper.getFirebaseAuth()
+                        .fetchProvidersForEmail(email)
                         .addOnFailureListener(new TaskFailureLogger(
                                 TAG, "Error fetching providers for email"))
                         .addOnSuccessListener(new StartWelcomeBackFlow(email))
@@ -107,7 +106,7 @@ public void onSuccess(@NonNull ProviderQueryResult result) {
                 // Start email welcome back flow
                 mActivity.startActivityForResult(
                         WelcomeBackPasswordPrompt.createIntent(
-                                mHelper.getApplicationContext(),
+                                mActivity,
                                 mHelper.getFlowParams(),
                                 mResponse
                         ), mAccountLinkResultCode);
@@ -115,7 +114,7 @@ public void onSuccess(@NonNull ProviderQueryResult result) {
                 // Start IDP welcome back flow
                 mActivity.startActivityForResult(
                         WelcomeBackIdpPrompt.createIntent(
-                                mHelper.getApplicationContext(),
+                                mActivity,
                                 mHelper.getFlowParams(),
                                 result.getProviders().get(0),
                                 mResponse,
diff --git a/auth/src/main/res/layout/sign_in_layout.xml b/auth/src/main/res/layout/sign_in_layout.xml
deleted file mode 100644
index a53d74bd9..000000000
--- a/auth/src/main/res/layout/sign_in_layout.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/FirebaseUI.WrapperStyle">
-
-    <!--
-        Since the TextInputLayouts change size based on whether or not an error
-        is showing we use a relative layout to position them absolutely
-    -->
-    <android.support.design.widget.TextInputLayout
-        android:id="@+id/email_layout"
-        android:paddingTop="24dp"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        style="@style/FirebaseUI.Text.TextInputLayout"
-        app:hintTextAppearance="@style/FirebaseUI.Text.HintText"
-        app:errorTextAppearance="@style/FirebaseUI.Text.ErrorText"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <android.support.design.widget.TextInputEditText
-            style="@style/FirebaseUI.EditText.EmailField"
-            android:id="@+id/email"/>
-
-    </android.support.design.widget.TextInputLayout>
-
-    <android.support.design.widget.TextInputLayout
-        android:id="@+id/password_layout"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        style="@style/FirebaseUI.Text.TextInputLayout"
-        android:paddingTop="136dp"
-        app:hintTextAppearance="@style/FirebaseUI.Text.HintText"
-        app:errorTextAppearance="@style/FirebaseUI.Text.ErrorText"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:passwordToggleEnabled="true">
-
-        <android.support.design.widget.TextInputEditText
-            style="@style/FirebaseUI.EditText.PasswordField"
-            android:id="@+id/password"/>
-
-    </android.support.design.widget.TextInputLayout>
-
-    <LinearLayout
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:paddingTop="248dp">
-
-        <TextView
-            android:id="@+id/trouble_signing_in"
-            android:text="@string/trouble_signing_in"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:paddingTop="8dp"
-            style="@style/FirebaseUI.Text.Link"/>
-
-        <Button
-            style="@style/FirebaseUI.Button"
-            android:text="@string/next"
-            android:id="@+id/button_done"/>
-
-    </LinearLayout>
-
-</RelativeLayout>
diff --git a/auth/src/main/res/layout/welcome_back_idp_prompt_layout.xml b/auth/src/main/res/layout/welcome_back_idp_prompt_layout.xml
index eaad7bd28..207726847 100644
--- a/auth/src/main/res/layout/welcome_back_idp_prompt_layout.xml
+++ b/auth/src/main/res/layout/welcome_back_idp_prompt_layout.xml
@@ -25,6 +25,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end"
-        android:text="@string/sign_in"/>
+        android:text="@string/sign_in_default"/>
 
 </LinearLayout>
diff --git a/auth/src/main/res/layout/welcome_back_password_prompt_layout.xml b/auth/src/main/res/layout/welcome_back_password_prompt_layout.xml
index ce761cfcd..22bf29b0c 100644
--- a/auth/src/main/res/layout/welcome_back_password_prompt_layout.xml
+++ b/auth/src/main/res/layout/welcome_back_password_prompt_layout.xml
@@ -55,7 +55,7 @@
 
         <Button
             style="@style/FirebaseUI.Button"
-            android:text="@string/sign_in"
+            android:text="@string/sign_in_default"
             android:id="@+id/button_done"/>
 
     </LinearLayout>
diff --git a/auth/src/main/res/values/strings.xml b/auth/src/main/res/values/strings.xml
index 259831cf4..e5e81fde5 100644
--- a/auth/src/main/res/values/strings.xml
+++ b/auth/src/main/res/values/strings.xml
@@ -2,9 +2,8 @@
     <string name="app_name">ui_flow</string>
 
     <string name="default_toolbar_title">@string/app_name</string>
-    <string name="title_welcome_back_password_prompt">@string/sign_in</string>
-    <string name="title_sign_in_activity">@string/sign_in</string>
-    <string name="title_welcome_back_idp_prompt">@string/sign_in</string>
+    <string name="title_welcome_back_password_prompt">@string/sign_in_default</string>
+    <string name="title_welcome_back_idp_prompt">@string/sign_in_default</string>
     <string name="title_register_email_activity">@string/create_account_title</string>
     <string name="title_recover_password_activity">@string/recover_password_title</string>
     <string name="title_confirm_recover_password_activity">@string/check_your_email</string>
@@ -32,9 +31,8 @@
         password.</string>
     <string name="error_email_does_not_exist">That email address doesn\'t match an existing account</string>
     <string name="welcome_back">Welcome back!</string>
-    <string name="next">Next</string>
     <string name="trouble_signing_in">Trouble signing in?</string>
-    <string name="sign_in">Sign in</string>
+    <string name="sign_in_default">Sign in</string>
     <string name="sign_in_with_google">Sign in with Google</string>
     <string name="sign_in_with_facebook">Sign in with Facebook</string>
     <string name="check_your_email">Check your email</string>
@@ -54,7 +52,6 @@
     <string name="terms_of_service">Terms of Service</string>
     <string name="sign_in_with_email">Sign in with email</string>
     <string name="sign_in_with_twitter">Sign in with Twitter</string>
-    <string name="login_error">Login unsuccessful</string>
     <string name="email_account_creation_error">Email account registration unsuccessful</string>
 
     <string name="progress_dialog_loading">Loading…</string>
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/email/RegisterEmailActivityTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/email/RegisterEmailActivityTest.java
index 509504756..d112a8faf 100644
--- a/auth/src/test/java/com/firebase/ui/auth/ui/email/RegisterEmailActivityTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/ui/email/RegisterEmailActivityTest.java
@@ -87,9 +87,11 @@ public void testSignUpButton_validatesFields() {
                 nameLayout.getError().toString());
         assertEquals(
                 String.format(
+                        registerEmailActivity.getResources().getQuantityString(
+                                R.plurals.password_length,
+                                R.integer.min_password_length),
                         registerEmailActivity.getResources()
-                                .getQuantityString(R.plurals.password_length, 6),
-                        registerEmailActivity.getResources().getInteger(R.integer.min_password_length)
+                                .getInteger(R.integer.min_password_length)
                 ),
                 passwordLayout.getError().toString());
     }
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/email/SignInActivityTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/email/WelcomeBackPasswordPromptTest.java
similarity index 74%
rename from auth/src/test/java/com/firebase/ui/auth/ui/email/SignInActivityTest.java
rename to auth/src/test/java/com/firebase/ui/auth/ui/email/WelcomeBackPasswordPromptTest.java
index 2fb5dd9a6..cf5f51aee 100644
--- a/auth/src/test/java/com/firebase/ui/auth/ui/email/SignInActivityTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/ui/email/WelcomeBackPasswordPromptTest.java
@@ -20,6 +20,7 @@
 import android.widget.EditText;
 
 import com.firebase.ui.auth.BuildConfig;
+import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.testhelpers.ActivityHelperShadow;
 import com.firebase.ui.auth.testhelpers.AutoCompleteTask;
@@ -29,6 +30,7 @@
 import com.firebase.ui.auth.testhelpers.FirebaseAuthWrapperImplShadow;
 import com.firebase.ui.auth.testhelpers.TestConstants;
 import com.firebase.ui.auth.testhelpers.TestHelper;
+import com.firebase.ui.auth.ui.accountlink.WelcomeBackPasswordPrompt;
 import com.firebase.ui.auth.util.PlayServicesHelper;
 import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.EmailAuthProvider;
@@ -46,7 +48,7 @@
 import java.util.Collections;
 
 import static com.firebase.ui.auth.testhelpers.TestHelper.verifySmartLockSave;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.reset;
@@ -55,20 +57,20 @@
 
 @RunWith(CustomRobolectricGradleTestRunner.class)
 @Config(constants = BuildConfig.class, sdk = 23)
-public class SignInActivityTest {
+public class WelcomeBackPasswordPromptTest {
     @Before
     public void setUp() {
         TestHelper.initializeApp(RuntimeEnvironment.application);
         PlayServicesHelper.sApiAvailability = TestHelper.makeMockGoogleApiAvailability();
     }
 
-    private SignInActivity createActivity() {
-        Intent startIntent = SignInActivity.createIntent(
+    private WelcomeBackPasswordPrompt createActivity() {
+        Intent startIntent = WelcomeBackPasswordPrompt.createIntent(
                 RuntimeEnvironment.application,
                 TestHelper.getFlowParameters(Collections.<String>emptyList()),
-                null);
+                new IdpResponse(EmailAuthProvider.PROVIDER_ID, TestConstants.EMAIL));
         return Robolectric
-                .buildActivity(SignInActivity.class)
+                .buildActivity(WelcomeBackPasswordPrompt.class)
                 .withIntent(startIntent)
                 .create()
                 .visible()
@@ -77,24 +79,19 @@ private SignInActivity createActivity() {
 
     @Test
     public void testSignInButton_validatesFields() {
-        SignInActivity signInActivity = createActivity();
-        Button signIn = (Button) signInActivity.findViewById(R.id.button_done);
+        WelcomeBackPasswordPrompt welcomeBack = createActivity();
+        Button signIn = (Button) welcomeBack.findViewById(R.id.button_done);
         signIn.performClick();
-        TextInputLayout emailLayout =
-                (TextInputLayout) signInActivity.findViewById(R.id.email_layout);
         TextInputLayout passwordLayout =
-                (TextInputLayout) signInActivity.findViewById(R.id.password_layout);
+                (TextInputLayout) welcomeBack.findViewById(R.id.password_layout);
 
         assertEquals(
-                signInActivity.getResources().getString(R.string.missing_email_address),
-                emailLayout.getError());
-        assertEquals(
-                signInActivity.getResources().getString(R.string.required_field),
-                passwordLayout.getError());
+                welcomeBack.getString(R.string.required_field),
+                passwordLayout.getError().toString());
 
         // should block and not start a new activity
         ShadowActivity.IntentForResult nextIntent =
-                Shadows.shadowOf(signInActivity).getNextStartedActivityForResult();
+                Shadows.shadowOf(welcomeBack).getNextStartedActivityForResult();
         assertNull(nextIntent);
     }
 
@@ -105,10 +102,8 @@ public void testSignInButton_signsInAndSavesCredentials() {
         new ActivityHelperShadow();
         reset(ActivityHelperShadow.sSaveSmartLock);
 
-        SignInActivity signInActivity = createActivity();
-        EditText emailField = (EditText) signInActivity.findViewById(R.id.email);
-        EditText passwordField = (EditText) signInActivity.findViewById(R.id.password);
-        emailField.setText(TestConstants.EMAIL);
+        WelcomeBackPasswordPrompt welcomeBackActivity = createActivity();
+        EditText passwordField = (EditText) welcomeBackActivity.findViewById(R.id.password);
         passwordField.setText(TestConstants.PASSWORD);
 
         FirebaseUser mockFirebaseUser = mock(FirebaseUser.class);
@@ -121,13 +116,15 @@ public void testSignInButton_signsInAndSavesCredentials() {
         when(mockFirebaseUser.getEmail()).thenReturn(TestConstants.EMAIL);
         when(mockFirebaseUser.getPhotoUrl()).thenReturn(TestConstants.PHOTO_URI);
 
-        Button signIn = (Button) signInActivity.findViewById(R.id.button_done);
+        Button signIn = (Button) welcomeBackActivity.findViewById(R.id.button_done);
         signIn.performClick();
 
         verify(ActivityHelperShadow.sFirebaseAuth).signInWithEmailAndPassword(
                 TestConstants.EMAIL,
                 TestConstants.PASSWORD);
 
-        verifySmartLockSave(EmailAuthProvider.PROVIDER_ID, TestConstants.EMAIL, TestConstants.PASSWORD);
+        verifySmartLockSave(EmailAuthProvider.PROVIDER_ID,
+                            TestConstants.EMAIL,
+                            TestConstants.PASSWORD);
     }
 }
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandlerTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandlerTest.java
index 96d9ceb99..f702dbe23 100644
--- a/auth/src/test/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandlerTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandlerTest.java
@@ -91,7 +91,6 @@ public void testSignInSucceeded() {
         Context mockContext = mock(Context.class);
 
         Task signInTask = Tasks.forResult(new FakeAuthResult(mockFirebaseUser));
-        when(mockActivityHelper.getApplicationContext()).thenReturn(mockContext);
         when(mockActivityHelper.getFlowParams()).thenReturn(
                 TestHelper.getFlowParameters(Collections.<String>emptyList()));
         credentialSignInHandler.onComplete(signInTask);
@@ -133,7 +132,6 @@ public void testSignInFailed_withFacebookAlreadyLinked() {
         Context mockContext = mock(Context.class);
         FlowParameters mockFlowParams = mock(FlowParameters.class);
         when(mockActivityHelper.getFirebaseAuth()).thenReturn(mockFirebaseAuth);
-        when(mockActivityHelper.getApplicationContext()).thenReturn(mockContext);
         when(mockActivityHelper.getFlowParams()).thenReturn(mockFlowParams);
 
         // pretend the account has Facebook linked already
@@ -184,7 +182,6 @@ public void testSignInFailed_withPasswordAccountAlreadyLinked() {
         when(mockTask.getException()).thenReturn(
                 new FirebaseAuthUserCollisionException(LINKING_ERROR, LINKING_EXPLANATION));
         when(mockActivityHelper.getFirebaseAuth()).thenReturn(mockFirebaseAuth);
-        when(mockActivityHelper.getApplicationContext()).thenReturn(mockContext);
         when(mockActivityHelper.getFlowParams()).thenReturn(mockFlowParams);
 
         // pretend the account has a Password account linked already