diff --git a/mRemoteNGTests/Config/CredentialRecordLoaderTests.cs b/mRemoteNGTests/Config/CredentialRecordLoaderTests.cs
new file mode 100644
index 00000000..3a417716
--- /dev/null
+++ b/mRemoteNGTests/Config/CredentialRecordLoaderTests.cs
@@ -0,0 +1,40 @@
+using System.Collections.Generic;
+using mRemoteNG.Config;
+using mRemoteNG.Config.DataProviders;
+using mRemoteNG.Config.Serializers;
+using mRemoteNG.Credential;
+using NSubstitute;
+using NUnit.Framework;
+
+namespace mRemoteNGTests.Config
+{
+    public class CredentialRecordLoaderTests
+    {
+        private CredentialRecordLoader _credentialRecordLoader;
+        private IDataProvider<string> _dataProvider;
+        private IDeserializer<string, IEnumerable<ICredentialRecord>> _deserializer;
+
+        [SetUp]
+        public void Setup()
+        {
+            _dataProvider = Substitute.For<IDataProvider<string>>();
+            _deserializer = Substitute.For<IDeserializer<string, IEnumerable<ICredentialRecord>>>();
+            _credentialRecordLoader = new CredentialRecordLoader(_dataProvider, _deserializer);
+        }
+
+        [Test]
+        public void LoadsFromDataProvider()
+        {
+            _credentialRecordLoader.Load();
+            _dataProvider.Received(1).Load();
+        }
+
+        [Test]
+        public void DeserializesDataFromDataProvider()
+        {
+            _dataProvider.Load().Returns("mydata");
+            _credentialRecordLoader.Load();
+            _deserializer.Received(1).Deserialize("mydata");
+        }
+    }
+}
\ No newline at end of file
diff --git a/mRemoteNGTests/mRemoteNGTests.csproj b/mRemoteNGTests/mRemoteNGTests.csproj
index d7f823f7..073ef319 100644
--- a/mRemoteNGTests/mRemoteNGTests.csproj
+++ b/mRemoteNGTests/mRemoteNGTests.csproj
@@ -111,6 +111,7 @@
     <Compile Include="App\UpdaterTests.cs" />
     <Compile Include="BinaryFileTests.cs" />
     <Compile Include="Config\CredentialHarvesterTests.cs" />
+    <Compile Include="Config\CredentialRecordLoaderTests.cs" />
     <Compile Include="Config\Serializers\ConfConsEnsureConnectionsHaveIdsTests.cs" />
     <Compile Include="Config\Serializers\CredentialProviderSerializerTests.cs" />
     <Compile Include="Config\Serializers\CredentialSerializers\XmlCredentialPasswordDecryptorDecoratorTests.cs" />
diff --git a/mRemoteV1/Credential/Repositories/XmlCredentialRepository.cs b/mRemoteV1/Credential/Repositories/XmlCredentialRepository.cs
index ccdc3f82..5acc4eea 100644
--- a/mRemoteV1/Credential/Repositories/XmlCredentialRepository.cs
+++ b/mRemoteV1/Credential/Repositories/XmlCredentialRepository.cs
@@ -18,7 +18,6 @@ namespace mRemoteNG.Credential.Repositories
 
         public ICredentialRepositoryConfig Config { get; }
         public IList<ICredentialRecord> CredentialRecords { get; }
-        public IKeyProvider PasswordRequestor { get; set; } = new PasswordForm("", false);
         public bool IsLoaded { get; private set; }
 
         public XmlCredentialRepository(ICredentialRepositoryConfig config, CredentialRecordSaver credentialRecordSaver, CredentialRecordLoader credentialRecordLoader)