diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d34879ec2..390e119ea 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -128,7 +128,7 @@
             android:launchMode="singleTask"
             android:label="@string/menu_about" />
         <activity android:name="com.kunzisoft.keepass.settings.SettingsActivity" />
-        <activity android:name="com.kunzisoft.keepass.autofill.AutoFillLauncherActivity"
+        <activity android:name="com.kunzisoft.keepass.autofill.AutofillLauncherActivity"
             android:configChanges="orientation|keyboardHidden" />
         <activity android:name="com.kunzisoft.keepass.settings.SettingsAutofillActivity" />
         <activity android:name="com.kunzisoft.keepass.magikeyboard.KeyboardLauncherActivity"
diff --git a/app/src/main/java/com/kunzisoft/keepass/autofill/AutoFillLauncherActivity.kt b/app/src/main/java/com/kunzisoft/keepass/autofill/AutofillLauncherActivity.kt
similarity index 95%
rename from app/src/main/java/com/kunzisoft/keepass/autofill/AutoFillLauncherActivity.kt
rename to app/src/main/java/com/kunzisoft/keepass/autofill/AutofillLauncherActivity.kt
index 7d35cb452..bfcb6a14c 100644
--- a/app/src/main/java/com/kunzisoft/keepass/autofill/AutoFillLauncherActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/autofill/AutofillLauncherActivity.kt
@@ -35,7 +35,7 @@ import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.timeout.TimeoutHelper
 
 @RequiresApi(api = Build.VERSION_CODES.O)
-class AutoFillLauncherActivity : AppCompatActivity() {
+class AutofillLauncherActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         // Pass extra for Autofill (EXTRA_ASSIST_STRUCTURE)
@@ -61,7 +61,7 @@ class AutoFillLauncherActivity : AppCompatActivity() {
     companion object {
 
         fun getAuthIntentSenderForResponse(context: Context): IntentSender {
-            val intent = Intent(context, AutoFillLauncherActivity::class.java)
+            val intent = Intent(context, AutofillLauncherActivity::class.java)
             return PendingIntent.getActivity(context, 0,
                     intent, PendingIntent.FLAG_CANCEL_CURRENT).intentSender
         }
diff --git a/app/src/main/java/com/kunzisoft/keepass/autofill/KeeAutofillService.kt b/app/src/main/java/com/kunzisoft/keepass/autofill/KeeAutofillService.kt
index baa50588c..ffa32e526 100644
--- a/app/src/main/java/com/kunzisoft/keepass/autofill/KeeAutofillService.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/autofill/KeeAutofillService.kt
@@ -44,7 +44,7 @@ class KeeAutofillService : AutofillService() {
             if (listOf(*autofillIds).isNotEmpty()) {
                 // If the entire Autofill Response is authenticated, AuthActivity is used
                 // to generate Response.
-                val sender = AutoFillLauncherActivity.getAuthIntentSenderForResponse(this)
+                val sender = AutofillLauncherActivity.getAuthIntentSenderForResponse(this)
                 val presentation = RemoteViews(packageName, R.layout.autofill_service_unlock)
                 responseBuilder.setAuthentication(autofillIds, sender, presentation)
                 callback.onSuccess(responseBuilder.build())
diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/SettingsAutofillActivity.kt b/app/src/main/java/com/kunzisoft/keepass/settings/SettingsAutofillActivity.kt
index 56610b346..798e5aa99 100644
--- a/app/src/main/java/com/kunzisoft/keepass/settings/SettingsAutofillActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/settings/SettingsAutofillActivity.kt
@@ -19,10 +19,16 @@
  */
 package com.kunzisoft.keepass.settings
 
+import android.os.Bundle
 import android.support.v4.app.Fragment
 
 class SettingsAutofillActivity : SettingsActivity() {
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        timeoutEnable = false
+    }
+
     override fun retrieveMainFragment(): Fragment {
         return NestedSettingsFragment.newInstance(NestedSettingsFragment.Screen.FORM_FILLING)
     }
diff --git a/app/src/main/res/xml/dataset_service.xml b/app/src/main/res/xml/dataset_service.xml
index d073a2399..51a669496 100644
--- a/app/src/main/res/xml/dataset_service.xml
+++ b/app/src/main/res/xml/dataset_service.xml
@@ -15,7 +15,7 @@
 -->
 
 <!--
-Attributes for the AutoFill service that tell the framework what will act as the Autofill service's
+Attributes for the Autofill service that tell the framework what will act as the Autofill service's
 Settings Activity. This is pointed to in the service's meta-data in the application's manifest.
 -->
 <autofill-service xmlns:android="http://schemas.android.com/apk/res/android"