diff --git a/InstallShield 2012 Spring Projects/SafeExamBrowser_2018.ism b/InstallShield 2012 Spring Projects/SafeExamBrowser_2018.ism
index 3828d8f..0f4233f 100644
Binary files a/InstallShield 2012 Spring Projects/SafeExamBrowser_2018.ism and b/InstallShield 2012 Spring Projects/SafeExamBrowser_2018.ism differ
diff --git a/SebWindowsClient/SebWindowsClient/CryptographyUtils/SEBProtectionController.cs b/SebWindowsClient/SebWindowsClient/CryptographyUtils/SEBProtectionController.cs
index d8c13c7..68fc446 100644
--- a/SebWindowsClient/SebWindowsClient/CryptographyUtils/SEBProtectionController.cs
+++ b/SebWindowsClient/SebWindowsClient/CryptographyUtils/SEBProtectionController.cs
@@ -145,11 +145,15 @@ public static ArrayList GetSSLCertificatesAndNames(ref ArrayList certificateName
 
             X509Store store = new X509Store(StoreName.CertificateAuthority);
             store.Open(OpenFlags.ReadOnly);
-            X509Certificate2Collection certsCollection = store.Certificates.Find(X509FindType.FindByKeyUsage, (X509KeyUsageFlags.DigitalSignature | X509KeyUsageFlags.KeyEncipherment), false);
+            X509Certificate2Collection certsCollection = store.Certificates.Find(X509FindType.FindByKeyUsage, (X509KeyUsageFlags.DigitalSignature), false);
+            X509Certificate2Collection certsCollection2 = store.Certificates.Find(X509FindType.FindByKeyUsage, (X509KeyUsageFlags.KeyEncipherment), false);
             store = new X509Store(StoreName.AddressBook);
             store.Open(OpenFlags.ReadOnly);
-            X509Certificate2Collection certsCollection2 = store.Certificates.Find(X509FindType.FindByKeyUsage, (X509KeyUsageFlags.DigitalSignature | X509KeyUsageFlags.KeyEncipherment), false);
+            X509Certificate2Collection certsCollection3 = store.Certificates.Find(X509FindType.FindByKeyUsage, (X509KeyUsageFlags.DigitalSignature), false);
+            X509Certificate2Collection certsCollection4 = store.Certificates.Find(X509FindType.FindByKeyUsage, (X509KeyUsageFlags.KeyEncipherment), false);
             certsCollection.AddRange(certsCollection2);
+            certsCollection.AddRange(certsCollection3);
+            certsCollection.AddRange(certsCollection4);
 
             foreach (X509Certificate2 x509Certificate in certsCollection)
             {
diff --git a/SebWindowsClient/SebWindowsClient/Properties/AssemblyInfo.cs b/SebWindowsClient/SebWindowsClient/Properties/AssemblyInfo.cs
index cf8e062..84a6e71 100644
--- a/SebWindowsClient/SebWindowsClient/Properties/AssemblyInfo.cs
+++ b/SebWindowsClient/SebWindowsClient/Properties/AssemblyInfo.cs
@@ -31,4 +31,4 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("2.3.*")]
-[assembly: AssemblyInformationalVersion("2.3pre4")]
+[assembly: AssemblyInformationalVersion("2.3")]