diff --git a/src/Android/MainActivity.cs b/src/Android/MainActivity.cs
index 3a691a6c9..9ae845707 100644
--- a/src/Android/MainActivity.cs
+++ b/src/Android/MainActivity.cs
@@ -27,6 +27,7 @@ namespace Bit.Droid
         Icon = "@mipmap/ic_launcher",
         Theme = "@style/LaunchTheme",
         MainLauncher = true,
+        TaskAffinity = "",
         ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation |
                                ConfigChanges.Keyboard | ConfigChanges.KeyboardHidden |
                                ConfigChanges.Navigation)]
diff --git a/src/Android/WebAuthCallbackActivity.cs b/src/Android/WebAuthCallbackActivity.cs
index c551adf40..4e8fc6404 100644
--- a/src/Android/WebAuthCallbackActivity.cs
+++ b/src/Android/WebAuthCallbackActivity.cs
@@ -3,7 +3,10 @@ using Android.Content.PM;
 
 namespace Bit.Droid
 {
-    [Activity(NoHistory = true, LaunchMode = LaunchMode.SingleTop)]
+    [Activity(
+        Exported = false,
+        NoHistory = true, 
+        LaunchMode = LaunchMode.SingleTop)]
     [IntentFilter(new[] { Android.Content.Intent.ActionView },
         Categories = new[] { Android.Content.Intent.CategoryDefault, Android.Content.Intent.CategoryBrowsable },
         DataScheme = "bitwarden")]