diff --git a/KeePassQuickUnlock.csproj b/KeePassQuickUnlock.csproj
index 374cdac..32362fe 100644
--- a/KeePassQuickUnlock.csproj
+++ b/KeePassQuickUnlock.csproj
@@ -87,7 +87,7 @@
     <None Include="Resources\B48x48_TimeLock.png" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\KeePass-2.34-Source\KeePass\KeePass.csproj">
+    <ProjectReference Include="..\KeePass-2.35-Source\KeePass\KeePass.csproj">
       <Project>{10938016-dee2-4a25-9a5a-8fd3444379ca}</Project>
       <Name>KeePass</Name>
     </ProjectReference>
diff --git a/KeePassQuickUnlock.sln b/KeePassQuickUnlock.sln
index d071db2..0e16389 100644
--- a/KeePassQuickUnlock.sln
+++ b/KeePassQuickUnlock.sln
@@ -5,7 +5,7 @@ VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePassQuickUnlock", "KeePassQuickUnlock.csproj", "{6A249FA1-3F87-4C81-8D31-6BDF62308F48}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePass", "..\KeePass-2.34-Source\KeePass\KeePass.csproj", "{10938016-DEE2-4A25-9A5A-8FD3444379CA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePass", "..\KeePass-2.35-Source\KeePass\KeePass.csproj", "{10938016-DEE2-4A25-9A5A-8FD3444379CA}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/KeePassQuickUnlockExt.cs b/KeePassQuickUnlockExt.cs
index 9af1abc..dc432ad 100644
--- a/KeePassQuickUnlockExt.cs
+++ b/KeePassQuickUnlockExt.cs
@@ -189,6 +189,12 @@ private void WindowAddedHandler(object sender, GwmWindowEventArgs e)
 									{
 										m_cmbKeyFile.SelectedIndex = index;
 
+										var m_cbPassword = keyPromptForm.Controls.Find("m_cbPassword", false).FirstOrDefault() as CheckBox;
+										if (m_cbPassword != null)
+										{
+											m_cbPassword.Checked = false;
+										}
+
 										// If AutoPrompt is enabled click the Ok button.
 										if (Host.CustomConfig.GetBool(QuickUnlockProvider.CfgAutoPrompt, true))
 										{
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index f9b5776..a9d4c72 100644
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.1.0")]
-[assembly: AssemblyFileVersion("2.1.1.0")]
+[assembly: AssemblyVersion("2.2.0.0")]
+[assembly: AssemblyFileVersion("2.2.0.0")]
diff --git a/keepass.version b/keepass.version
index bdc3ca0..08779a8 100644
--- a/keepass.version
+++ b/keepass.version
@@ -1,3 +1,3 @@
 :
-KeePassQuickUnlock:2.1.1
+KeePassQuickUnlock:2.2.0
 :