diff --git a/src/core/Config.cpp b/src/core/Config.cpp
index 133a03a9e..76f0e6f8e 100644
--- a/src/core/Config.cpp
+++ b/src/core/Config.cpp
@@ -95,13 +95,13 @@ void Config::init(const QString& fileName)
     m_defaults.insert("ShowToolbar", true);
     m_defaults.insert("MinimizeOnCopy", false);
     m_defaults.insert("UseGroupIconOnEntryCreation", false);
-    m_defaults.insert("AutoTypeEntryTitleMatch", false);
+    m_defaults.insert("AutoTypeEntryTitleMatch", true);
     m_defaults.insert("security/clearclipboard", true);
     m_defaults.insert("security/clearclipboardtimeout", 10);
     m_defaults.insert("security/lockdatabaseidle", false);
     m_defaults.insert("security/lockdatabaseidlesec", 10);
     m_defaults.insert("security/passwordscleartext", false);
-    m_defaults.insert("security/autotypeask", false);
+    m_defaults.insert("security/autotypeask", true);
 }
 
 Config* Config::instance()
diff --git a/tests/TestAutoType.cpp b/tests/TestAutoType.cpp
index 0b2f3b250..c09a8366c 100644
--- a/tests/TestAutoType.cpp
+++ b/tests/TestAutoType.cpp
@@ -36,6 +36,8 @@ void TestAutoType::initTestCase()
     Crypto::init();
     Config::createTempFileInstance();
     AutoType::createTestInstance();
+    config()->set("AutoTypeEntryTitleMatch", false);
+    config()->set("security/autotypeask", false);
 
     QPluginLoader loader(filePath()->pluginPath("keepassx-autotype-test"));
     loader.setLoadHints(QLibrary::ResolveAllSymbolsHint);