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 11ccfd536..446fb7d43 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
@@ -44,6 +44,7 @@
 import com.google.firebase.auth.FacebookAuthProvider;
 import com.google.firebase.auth.FirebaseAuthInvalidUserException;
 import com.google.firebase.auth.GoogleAuthProvider;
+import com.google.firebase.auth.TwitterAuthProvider;
 
 import java.util.List;
 
@@ -326,6 +327,13 @@ protected void redirectToIdpSignIn(String email, String accountType) {
                         FacebookAuthProvider.PROVIDER_ID,
                         email);
                 break;
+            case IdentityProviders.TWITTER:
+                nextIntent = IDPSignInContainerActivity.createIntent(
+                        this,
+                        mActivityHelper.getFlowParams(),
+                        TwitterAuthProvider.PROVIDER_ID,
+                        email);
+                break;
             default:
                 Log.w(TAG, "unknown provider: " + accountType);
                 nextIntent = AuthMethodPickerActivity.createIntent(
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/idp/IDPSignInContainerActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/idp/IDPSignInContainerActivity.java
index 998a72f70..910e9031e 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/idp/IDPSignInContainerActivity.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/idp/IDPSignInContainerActivity.java
@@ -23,6 +23,7 @@
 import com.firebase.ui.auth.provider.IDPProvider;
 import com.firebase.ui.auth.provider.IDPProviderParcel;
 import com.firebase.ui.auth.provider.IDPResponse;
+import com.firebase.ui.auth.provider.TwitterProvider;
 import com.firebase.ui.auth.ui.ActivityHelper;
 import com.firebase.ui.auth.ui.ExtraConstants;
 import com.firebase.ui.auth.ui.FlowParameters;
@@ -33,6 +34,7 @@
 import com.google.firebase.auth.FacebookAuthProvider;
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.GoogleAuthProvider;
+import com.google.firebase.auth.TwitterAuthProvider;
 
 public class IDPSignInContainerActivity extends IDPBaseActivity implements IDPProvider.IDPCallback {
     private static final String TAG = "IDPSignInContainer";
@@ -63,6 +65,8 @@ protected void onCreate(Bundle savedInstanceState) {
             mIDPProvider = new FacebookProvider(this, providerParcel);
         } else if (mProvider.equalsIgnoreCase(GoogleAuthProvider.PROVIDER_ID)) {
             mIDPProvider = new GoogleProvider(this, providerParcel, mEmail);
+        } else if (mProvider.equalsIgnoreCase(TwitterAuthProvider.PROVIDER_ID)) {
+            mIDPProvider = new TwitterProvider(this, providerParcel);
         }
         mIDPProvider.setAuthenticationCallback(this);
         mIDPProvider.startLogin(this);