diff --git a/mRemoteV1/Credential/CredentialChangedEventArgs.cs b/mRemoteV1/Credential/CredentialChangedEventArgs.cs
new file mode 100644
index 000000000..0970c1764
--- /dev/null
+++ b/mRemoteV1/Credential/CredentialChangedEventArgs.cs
@@ -0,0 +1,21 @@
+using System;
+
+namespace mRemoteNG.Credential
+{
+    public class CredentialChangedEventArgs
+    {
+        public ICredentialRecord CredentialRecord { get; }
+        public ICredentialRepository Repository { get; }
+
+        public CredentialChangedEventArgs(ICredentialRecord credentialRecord, ICredentialRepository repository)
+        {
+            if (credentialRecord == null)
+                throw new ArgumentNullException(nameof(credentialRecord));
+            if (repository == null)
+                throw new ArgumentNullException(nameof(repository));
+
+            CredentialRecord = credentialRecord;
+            Repository = repository;
+        }
+    }
+}
\ No newline at end of file
diff --git a/mRemoteV1/Credential/CredentialRepositoryChangedArgs.cs b/mRemoteV1/Credential/CredentialRepositoryChangedArgs.cs
new file mode 100644
index 000000000..716509d04
--- /dev/null
+++ b/mRemoteV1/Credential/CredentialRepositoryChangedArgs.cs
@@ -0,0 +1,17 @@
+using System;
+
+namespace mRemoteNG.Credential
+{
+    public class CredentialRepositoryChangedArgs
+    {
+        public ICredentialRepository Repository { get; }
+
+        public CredentialRepositoryChangedArgs(ICredentialRepository repository)
+        {
+            if (repository == null)
+                throw new ArgumentNullException(nameof(repository));
+
+            Repository = repository;
+        }
+    }
+}
\ No newline at end of file
diff --git a/mRemoteV1/mRemoteV1.csproj b/mRemoteV1/mRemoteV1.csproj
index 9758f905d..ea98fd2dc 100644
--- a/mRemoteV1/mRemoteV1.csproj
+++ b/mRemoteV1/mRemoteV1.csproj
@@ -209,8 +209,10 @@
     <Compile Include="Connection\IHasParent.cs" />
     <Compile Include="Connection\Protocol\ProtocolFactory.cs" />
     <Compile Include="Connection\Protocol\VNC\VNCEnum.cs" />
+    <Compile Include="Credential\CredentialChangedEventArgs.cs" />
     <Compile Include="Credential\CredentialDeletionMsgBoxConfirmer.cs" />
     <Compile Include="Credential\CredentialDomainUserComparer.cs" />
+    <Compile Include="Credential\CredentialRepositoryChangedArgs.cs" />
     <Compile Include="Credential\CredentialRepositoryList.cs" />
     <Compile Include="Credential\CredentialRecord.cs" />
     <Compile Include="Credential\CredentialRecordTypeConverter.cs" />