diff --git a/mRemoteNGTests/Config/Serializers/MiscSerializers/PuttyConnectionManagerDeserializerTests.cs b/mRemoteNGTests/Config/Serializers/MiscSerializers/PuttyConnectionManagerDeserializerTests.cs
index 1857496c..5e3f1aaa 100644
--- a/mRemoteNGTests/Config/Serializers/MiscSerializers/PuttyConnectionManagerDeserializerTests.cs
+++ b/mRemoteNGTests/Config/Serializers/MiscSerializers/PuttyConnectionManagerDeserializerTests.cs
@@ -82,6 +82,14 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers
             Assert.That(connection.PuttySession, Is.EqualTo(ExpectedPuttySession));
         }
 
+        [Test]
+        public void CredentialIdProperlySet()
+        {
+            var connection = GetSshConnection();
+            var cred = _deserializationResult.ConnectionToCredentialMap.DistinctCredentialRecords.First();
+            Assert.That(connection.CredentialRecordId.FirstOrDefault(), Is.EqualTo(cred.Id));
+        }
+
         [Test]
         public void ConnectionUsernameImported()
         {
diff --git a/mRemoteV1/Config/Serializers/MiscSerializers/PuttyConnectionManagerDeserializer.cs b/mRemoteV1/Config/Serializers/MiscSerializers/PuttyConnectionManagerDeserializer.cs
index c9af6f27..81e3ac25 100644
--- a/mRemoteV1/Config/Serializers/MiscSerializers/PuttyConnectionManagerDeserializer.cs
+++ b/mRemoteV1/Config/Serializers/MiscSerializers/PuttyConnectionManagerDeserializer.cs
@@ -107,6 +107,7 @@ namespace mRemoteNG.Config.Serializers
 
             var connectionInfo = ConnectionInfoFromXml(connectionNode);
             var cred = CredentialFromXml(connectionNode);
+            connectionInfo.CredentialRecordId = cred.Id;
             credentialMap.Add(Guid.Parse(connectionInfo.ConstantID), cred);
             return connectionInfo;
         }