diff --git a/mRemoteV1/UI/Forms/frmMain.cs b/mRemoteV1/UI/Forms/frmMain.cs
index 2da3e0a7..b7696f8c 100644
--- a/mRemoteV1/UI/Forms/frmMain.cs
+++ b/mRemoteV1/UI/Forms/frmMain.cs
@@ -265,6 +265,7 @@ namespace mRemoteNG.UI.Forms
 
         private void UnlockRepositories(IEnumerable<ICredentialRepository> repositories, IWin32Window parentForm)
         {
+            if (!Settings.Default.PromptUnlockCredReposOnStartup) return;
             var credentialUnlockerForm = _credRepoUnlockerFormFactory.Build(repositories);
             credentialUnlockerForm.ShowDialog(parentForm);
         }