diff --git a/src/App/App.csproj b/src/App/App.csproj
index a3d4e6917..28d73e6f9 100644
--- a/src/App/App.csproj
+++ b/src/App/App.csproj
@@ -173,6 +173,11 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>AppResources.es.resx</DependentUpon>
     </Compile>
+    <Compile Include="Resources\AppResources.fi.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>AppResources.fi.resx</DependentUpon>
+    </Compile>
     <Compile Include="Resources\AppResources.fr.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -226,6 +231,10 @@
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>AppResources.es.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <EmbeddedResource Include="Resources\AppResources.fi.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>AppResources.fi.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
     <EmbeddedResource Include="Resources\AppResources.fr.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>AppResources.fr.Designer.cs</LastGenOutput>
diff --git a/src/App/Pages/Vault/VaultAddLoginPage.cs b/src/App/Pages/Vault/VaultAddLoginPage.cs
index 2651a16c3..5a64c5f59 100644
--- a/src/App/Pages/Vault/VaultAddLoginPage.cs
+++ b/src/App/Pages/Vault/VaultAddLoginPage.cs
@@ -23,6 +23,7 @@ namespace Bit.App.Pages
         private readonly IConnectivity _connectivity;
         private readonly IGoogleAnalyticsService _googleAnalyticsService;
         private readonly ISettings _settings;
+        private readonly IAppInfoService _appInfoService;
         private readonly string _defaultUri;
         private readonly string _defaultName;
         private readonly bool _fromAutofill;
@@ -39,6 +40,7 @@ namespace Bit.App.Pages
             _connectivity = Resolver.Resolve<IConnectivity>();
             _googleAnalyticsService = Resolver.Resolve<IGoogleAnalyticsService>();
             _settings = Resolver.Resolve<ISettings>();
+            _appInfoService = Resolver.Resolve<IAppInfoService>();
 
             Init();
         }
@@ -201,10 +203,19 @@ namespace Bit.App.Pages
                 AlertNoConnection();
             }
 
-            if(Device.OS == TargetPlatform.iOS && !_settings.GetValueOrDefault(AddedLoginAlertKey, false))
+            if(!_fromAutofill && !_settings.GetValueOrDefault(AddedLoginAlertKey, false))
             {
                 _settings.AddOrUpdateValue(AddedLoginAlertKey, true);
-                DisplayAlert(AppResources.BitwardenAppExtension, AppResources.BitwardenAppExtensionAlert, AppResources.Ok);
+                if(Device.OS == TargetPlatform.iOS)
+                {
+                    DisplayAlert(AppResources.BitwardenAppExtension, AppResources.BitwardenAppExtensionAlert,
+                        AppResources.Ok);
+                }
+                else if(Device.OS == TargetPlatform.Android && !_appInfoService.AutofillServiceEnabled)
+                {
+                    DisplayAlert(AppResources.BitwardenAutofillService, AppResources.BitwardenAutofillServiceAlert,
+                        AppResources.Ok);
+                }
             }
         }
 
diff --git a/src/App/Resources/AppResources.Designer.cs b/src/App/Resources/AppResources.Designer.cs
index 5db48d75d..b549d374f 100644
--- a/src/App/Resources/AppResources.Designer.cs
+++ b/src/App/Resources/AppResources.Designer.cs
@@ -232,6 +232,15 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to The easiest way to add new logins to your vault is from the bitwarden Auto-fill Service. Learn more about using the bitwarden Auto-fill Service by navigating to the &quot;Tools&quot; screen..
+        /// </summary>
+        public static string BitwardenAutofillServiceAlert {
+            get {
+                return ResourceManager.GetString("BitwardenAutofillServiceAlert", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Use the bitwarden accessibility service to auto-fill your logins..
         /// </summary>
diff --git a/src/App/Resources/AppResources.fi.Designer.cs b/src/App/Resources/AppResources.fi.Designer.cs
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/App/Resources/AppResources.resx b/src/App/Resources/AppResources.resx
index 13c78f377..d23dc4d51 100644
--- a/src/App/Resources/AppResources.resx
+++ b/src/App/Resources/AppResources.resx
@@ -792,4 +792,7 @@
   <data name="Beta" xml:space="preserve">
     <value>Beta</value>
   </data>
+  <data name="BitwardenAutofillServiceAlert" xml:space="preserve">
+    <value>The easiest way to add new logins to your vault is from the bitwarden Auto-fill Service. Learn more about using the bitwarden Auto-fill Service by navigating to the "Tools" screen.</value>
+  </data>
 </root>
\ No newline at end of file