diff --git a/Modules/VMware.vSphere.SsoAdmin/net45/VMware.vSphere.SsoAdmin.Utils.dll b/Modules/VMware.vSphere.SsoAdmin/net45/VMware.vSphere.SsoAdmin.Utils.dll
index 0a89d22..405d8fa 100644
Binary files a/Modules/VMware.vSphere.SsoAdmin/net45/VMware.vSphere.SsoAdmin.Utils.dll and b/Modules/VMware.vSphere.SsoAdmin/net45/VMware.vSphere.SsoAdmin.Utils.dll differ
diff --git a/Modules/VMware.vSphere.SsoAdmin/netcoreapp2.0/VMware.vSphere.SsoAdmin.Utils.dll b/Modules/VMware.vSphere.SsoAdmin/netcoreapp2.0/VMware.vSphere.SsoAdmin.Utils.dll
index 91f750d..0013f38 100644
Binary files a/Modules/VMware.vSphere.SsoAdmin/netcoreapp2.0/VMware.vSphere.SsoAdmin.Utils.dll and b/Modules/VMware.vSphere.SsoAdmin/netcoreapp2.0/VMware.vSphere.SsoAdmin.Utils.dll differ
diff --git a/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdmin.Utils/StirngToSsoAdminServerArgumentTransformationAttribute.cs b/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdmin.Utils/StirngToSsoAdminServerArgumentTransformationAttribute.cs
index 16d200f..5d8c885 100644
--- a/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdmin.Utils/StirngToSsoAdminServerArgumentTransformationAttribute.cs
+++ b/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdmin.Utils/StirngToSsoAdminServerArgumentTransformationAttribute.cs
@@ -43,7 +43,7 @@ namespace VMware.vSphere.SsoAdmin.Utils
                result = obnMatchingServers.ToArray();
             } else {
                // Non-terminating error for not matching value
-               engineIntrinsics.Host.UI.WriteErrorLine($"'{obnValue}' doesn't match any objects in $global:DefaultSsoAdminServer variable");
+               engineIntrinsics.Host.UI.WriteErrorLine($"'{obnValue}' doesn't match any objects in $global:DefaultSsoAdminServers variable");
             }
             
          }
diff --git a/Modules/VMware.vSphere.SsoAdmin/src/test/ConnectDisconnect.Tests.ps1 b/Modules/VMware.vSphere.SsoAdmin/src/test/ConnectDisconnect.Tests.ps1
index 53ef770..e7ee61c 100644
--- a/Modules/VMware.vSphere.SsoAdmin/src/test/ConnectDisconnect.Tests.ps1
+++ b/Modules/VMware.vSphere.SsoAdmin/src/test/ConnectDisconnect.Tests.ps1
@@ -114,7 +114,7 @@ Describe "Connect-SsoAdminServer and Disconnect-SsoAdminServer Tests" {
                -SkipCertificateCheck)
 
          # Act
-         
+
          # Assert
          {Disconnect-SsoAdminServer} | should -Throw 'Connected to more than 1 SSO server, please specify a SSO server via -Server parameter'
          (Compare-Object $global:DefaultSsoAdminServers $expected -IncludeEqual).Count | Should Be 2
@@ -159,5 +159,60 @@ Describe "Connect-SsoAdminServer and Disconnect-SsoAdminServer Tests" {
          $global:DefaultSsoAdminServers | Should Not Contain $expected
          $expected.IsConnected | Should Be $false
       }
+
+      It 'Disconnects DefaultSsoAdminServers when * is specified on -Server parameter' {
+         # Arrange
+         $expected = Connect-SsoAdminServer `
+               -Server $VcAddress `
+               -User $User `
+               -Password $Password `
+               -SkipCertificateCheck
+
+         # Act
+         Disconnect-SsoAdminServer -Server "*"
+
+
+         # Assert
+         $global:DefaultSsoAdminServers.Count | Should Be 0
+         $expected.IsConnected | Should Be $false
+      }
+
+      It 'Disconnects server specified as string that is equal to VC Address' {
+         # Arrange
+         $expected = Connect-SsoAdminServer `
+               -Server $VcAddress `
+               -User $User `
+               -Password $Password `
+               -SkipCertificateCheck
+
+         # Act
+         Disconnect-SsoAdminServer -Server $VcAddress
+
+
+         # Assert
+         $global:DefaultSsoAdminServers.Count | Should Be 0
+         $expected.IsConnected | Should Be $false
+      }
+
+      It 'Disconnect-SsoAdminServer fails when string that does not match any servers is specified' {
+         # Arrange
+         $expected = Connect-SsoAdminServer `
+               -Server $VcAddress `
+               -User $User `
+               -Password $Password `
+               -SkipCertificateCheck
+
+         # Act
+         { Disconnect-SsoAdminServer -Server "testserver" } | Should Throw
+
+
+         # Assert
+         $global:DefaultSsoAdminServers.Count | Should Be 1
+         $global:DefaultSsoAdminServers[0] | Should Be $expected
+         $expected.IsConnected | Should Be $true
+
+         # Cleanup
+         Disconnect-SsoAdminServer -Server $expected
+      }
    }
 }
\ No newline at end of file