diff --git a/OfflineInstallPreparation.ps1 b/OfflineInstallPreparation.ps1
index b474bc3..83cca2c 100644
--- a/OfflineInstallPreparation.ps1
+++ b/OfflineInstallPreparation.ps1
@@ -50,7 +50,7 @@ if (-not (Test-Path $ChocoInstallScript)) {
 
 $Signature = Get-AuthenticodeSignature -FilePath $ChocoInstallScript
 
-if ($Signature.Status -eq 'Valid' -and $Signature.SignerCertificate.Subject -eq 'CN="Chocolatey Software, Inc.", O="Chocolatey Software, Inc.", L=Topeka, S=Kansas, C=US') {
+if ($Signature.Status -eq 'Valid' -and $Signature.SignerCertificate.Subject -eq 'CN="Chocolatey Software, Inc", O="Chocolatey Software, Inc", L=Topeka, S=Kansas, C=US') {
     if (-not (Get-Command choco.exe -ErrorAction SilentlyContinue)) {
         if (Test-Path $PSScriptRoot\files\chocolatey.*.nupkg) {
             $env:ChocolateyDownloadUrl = (Convert-Path $PSScriptRoot\files\chocolatey.*.nupkg)[0]
diff --git a/Start-C4bNexusSetup.ps1 b/Start-C4bNexusSetup.ps1
index f25b531..2db20c8 100644
--- a/Start-C4bNexusSetup.ps1
+++ b/Start-C4bNexusSetup.ps1
@@ -82,7 +82,7 @@ process {
 
     $Signature = Get-AuthenticodeSignature -FilePath $ChocoInstallScript
 
-    if ($Signature.Status -eq 'Valid' -and $Signature.SignerCertificate.Subject -eq 'CN="Chocolatey Software, Inc.", O="Chocolatey Software, Inc.", L=Topeka, S=Kansas, C=US') {
+    if ($Signature.Status -eq 'Valid' -and $Signature.SignerCertificate.Subject -eq 'CN="Chocolatey Software, Inc", O="Chocolatey Software, Inc", L=Topeka, S=Kansas, C=US') {
         New-NexusRawComponent -RepositoryName 'choco-install' -File $ChocoInstallScript
     } else {
         Write-Error "ChocolateyInstall.ps1 script signature is not valid. Please investigate."