diff --git a/src/Android/Autofill/AutofillService.cs b/src/Android/Autofill/AutofillService.cs
index 46b577fbf..faafbfb67 100644
--- a/src/Android/Autofill/AutofillService.cs
+++ b/src/Android/Autofill/AutofillService.cs
@@ -33,8 +33,8 @@ namespace Bit.Android.Autofill
             var parser = new Parser(structure);
             parser.Parse();
 
-            if(!parser.FieldCollection.FillableForLogin || string.IsNullOrWhiteSpace(parser.Uri) ||
-                parser.Uri == "androidapp://com.x8bit.bitwarden" || parser.Uri == "androidapp://android")
+            if(string.IsNullOrWhiteSpace(parser.Uri) || parser.Uri == "androidapp://com.x8bit.bitwarden" ||
+                parser.Uri == "androidapp://android" || !parser.FieldCollection.FillableForLogin)
             {
                 return;
             }