diff --git a/src/Android/Resources/values/strings.xml b/src/Android/Resources/values/strings.xml
index 32f9c7df4..8b1de7b22 100644
--- a/src/Android/Resources/values/strings.xml
+++ b/src/Android/Resources/values/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="AutoFillServiceSummary">
-    Assist in filling username and password fields in other apps and on the web.
+    Assist with filling username and password fields in other apps and on the web.
   </string>
   <string name="AutoFillServiceDescription">
     It can be difficult for users (especially those with disabilities) to switch between apps and copy/paste
diff --git a/src/App/Pages/Tools/ToolsAccessibilityServicePage.cs b/src/App/Pages/Tools/ToolsAccessibilityServicePage.cs
index b8ec42f39..1f6180623 100644
--- a/src/App/Pages/Tools/ToolsAccessibilityServicePage.cs
+++ b/src/App/Pages/Tools/ToolsAccessibilityServicePage.cs
@@ -169,19 +169,6 @@ namespace Bit.App.Pages
             };
 
             ScrollView = new ScrollView { Content = DisabledStackLayout };
-
-            UpdateEnabled();
-            Device.StartTimer(new TimeSpan(0, 0, 3), () =>
-            {
-                if(_pageDisappeared)
-                {
-                    return false;
-                }
-                
-                UpdateEnabled();
-                return true;
-            });
-
             Title = AppResources.AutofillAccessibilityService;
             Content = ScrollView;
         }
@@ -189,6 +176,19 @@ namespace Bit.App.Pages
         protected override void OnAppearing()
         {
             _pageDisappeared = false;
+            UpdateEnabled();
+            Device.StartTimer(new TimeSpan(0, 0, 3), () =>
+            {
+                System.Diagnostics.Debug.WriteLine("Check timer on accessibility");
+                if(_pageDisappeared)
+                {
+                    return false;
+                }
+
+                UpdateEnabled();
+                return true;
+            });
+
             base.OnAppearing();
         }
 
@@ -200,7 +200,8 @@ namespace Bit.App.Pages
 
         private void UpdateEnabled()
         {
-            ScrollView.Content = _appInfoService.AutofillAccessibilityServiceEnabled ? EnabledStackLayout : DisabledStackLayout;
+            ScrollView.Content = _appInfoService.AutofillAccessibilityServiceEnabled ?
+                EnabledStackLayout : DisabledStackLayout;
         }
 
         private Label BuildServiceLabel()
diff --git a/src/App/Pages/Tools/ToolsAutofillServicePage.cs b/src/App/Pages/Tools/ToolsAutofillServicePage.cs
index 184310775..7c9accb45 100644
--- a/src/App/Pages/Tools/ToolsAutofillServicePage.cs
+++ b/src/App/Pages/Tools/ToolsAutofillServicePage.cs
@@ -120,10 +120,17 @@ namespace Bit.App.Pages
             };
 
             ScrollView = new ScrollView { Content = DisabledStackLayout };
+            Title = AppResources.AutofillService;
+            Content = ScrollView;
+        }
 
+        protected override void OnAppearing()
+        {
+            _pageDisappeared = false;
             UpdateEnabled();
             Device.StartTimer(new TimeSpan(0, 0, 2), () =>
             {
+                System.Diagnostics.Debug.WriteLine("Check timer on autofill");
                 if(_pageDisappeared)
                 {
                     return false;
@@ -133,13 +140,6 @@ namespace Bit.App.Pages
                 return true;
             });
 
-            Title = AppResources.AutofillService;
-            Content = ScrollView;
-        }
-
-        protected override void OnAppearing()
-        {
-            _pageDisappeared = false;
             base.OnAppearing();
         }