diff --git a/src/Android/AutofillService.cs b/src/Android/AutofillService.cs
index 15e61b98d..59c8a9d3b 100644
--- a/src/Android/AutofillService.cs
+++ b/src/Android/AutofillService.cs
@@ -70,7 +70,11 @@ namespace Bit.Android
         public override void OnAccessibilityEvent(AccessibilityEvent e)
         {
             var powerManager = (PowerManager)GetSystemService(PowerService);
-            if(!powerManager.IsInteractive)
+            if(Build.VERSION.SdkInt > BuildVersionCodes.KitkatWatch && !powerManager.IsInteractive)
+            {
+                return;
+            }
+            else if(Build.VERSION.SdkInt < BuildVersionCodes.Lollipop && !powerManager.IsScreenOn)
             {
                 return;
             }
@@ -337,11 +341,15 @@ namespace Bit.Android
             intent.SetFlags(ActivityFlags.NewTask | ActivityFlags.SingleTop | ActivityFlags.ClearTop);
             var pendingIntent = PendingIntent.GetActivity(this, 0, intent, PendingIntentFlags.UpdateCurrent);
 
+            var notificationContent = Build.VERSION.SdkInt > BuildVersionCodes.KitkatWatch ?
+                App.Resources.AppResources.BitwardenAutofillServiceNotificationContent :
+                App.Resources.AppResources.BitwardenAutofillServiceNotificationContentOld;
+
             var builder = new Notification.Builder(this);
             builder.SetSmallIcon(Resource.Drawable.notification_sm)
                    .SetContentTitle(App.Resources.AppResources.BitwardenAutofillService)
-                   .SetContentText(App.Resources.AppResources.BitwardenAutofillServiceNotificationContent)
-                   .SetTicker(App.Resources.AppResources.BitwardenAutofillServiceNotificationContent)
+                   .SetContentText(notificationContent)
+                   .SetTicker(notificationContent)
                    .SetWhen(now)
                    .SetContentIntent(pendingIntent);
 
diff --git a/src/App/Pages/Vault/VaultAutofillListLoginsPage.cs b/src/App/Pages/Vault/VaultAutofillListLoginsPage.cs
index 05eaccbc9..4f9a84ce9 100644
--- a/src/App/Pages/Vault/VaultAutofillListLoginsPage.cs
+++ b/src/App/Pages/Vault/VaultAutofillListLoginsPage.cs
@@ -205,7 +205,7 @@ namespace Bit.App.Pages
                 return;
             }
 
-            if(Uri.StartsWith("http") && _deviceInfoService.Version < 21)
+            if(_deviceInfoService.Version < 21)
             {
                 MoreClickedAsync(login);
             }
diff --git a/src/App/Pages/Vault/VaultListLoginsPage.cs b/src/App/Pages/Vault/VaultListLoginsPage.cs
index abca5e903..dac332a8a 100644
--- a/src/App/Pages/Vault/VaultListLoginsPage.cs
+++ b/src/App/Pages/Vault/VaultListLoginsPage.cs
@@ -403,7 +403,7 @@ namespace Bit.App.Pages
             }
             else if(selection == AppResources.Autofill)
             {
-                if(Uri.StartsWith("http") && _deviceInfoService.Version < 21)
+                if(_deviceInfoService.Version < 21)
                 {
                     MoreClickedAsync(login);
                 }
diff --git a/src/App/Resources/AppResources.Designer.cs b/src/App/Resources/AppResources.Designer.cs
index 04b2a5593..69b152f38 100644
--- a/src/App/Resources/AppResources.Designer.cs
+++ b/src/App/Resources/AppResources.Designer.cs
@@ -439,6 +439,15 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Tap this notification to view logins from your vault..
+        /// </summary>
+        public static string BitwardenAutofillServiceNotificationContentOld {
+            get {
+                return ResourceManager.GetString("BitwardenAutofillServiceNotificationContentOld", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Open Accessibility Settings.
         /// </summary>
diff --git a/src/App/Resources/AppResources.resx b/src/App/Resources/AppResources.resx
index 81507ccc5..bbd62447d 100644
--- a/src/App/Resources/AppResources.resx
+++ b/src/App/Resources/AppResources.resx
@@ -1027,4 +1027,7 @@
   <data name="WebVaultUrl" xml:space="preserve">
     <value>Web Vault Server URL</value>
   </data>
+  <data name="BitwardenAutofillServiceNotificationContentOld" xml:space="preserve">
+    <value>Tap this notification to view logins from your vault.</value>
+  </data>
 </root>
\ No newline at end of file