diff --git a/WAAD.WebSSO.PHP/csharp/code/libraries/powershell/Microsoft.Samples.Waad.PS/GetOrgIdSPN.cs b/WAAD.WebSSO.PHP/csharp/code/libraries/powershell/Microsoft.Samples.Waad.PS/GetOrgIdSPN.cs
index d45c2cf..445ce62 100644
--- a/WAAD.WebSSO.PHP/csharp/code/libraries/powershell/Microsoft.Samples.Waad.PS/GetOrgIdSPN.cs
+++ b/WAAD.WebSSO.PHP/csharp/code/libraries/powershell/Microsoft.Samples.Waad.PS/GetOrgIdSPN.cs
@@ -54,7 +54,7 @@ private GetOrgIdSpnResult GetSpn()
                     idpIdentifier = new Guid(entityDescriptor.Split('@')[1]);
                 }
 
-                return new GetOrgIdSpnResult(new Guid(this.AppPrincipalId), this.ApplicationDomain, idpIdentifier, entityDescriptor);
+                return new GetOrgIdSpnResult(new Guid(this.AppPrincipalId), this.ApplicationDomain, idpIdentifier);
             }
         }
     }
diff --git a/WAAD.WebSSO.PHP/csharp/code/libraries/powershell/Microsoft.Samples.Waad.PS/GetOrgIdSPNResult.cs b/WAAD.WebSSO.PHP/csharp/code/libraries/powershell/Microsoft.Samples.Waad.PS/GetOrgIdSPNResult.cs
index 0017485..8388d19 100644
--- a/WAAD.WebSSO.PHP/csharp/code/libraries/powershell/Microsoft.Samples.Waad.PS/GetOrgIdSPNResult.cs
+++ b/WAAD.WebSSO.PHP/csharp/code/libraries/powershell/Microsoft.Samples.Waad.PS/GetOrgIdSPNResult.cs
@@ -7,11 +7,11 @@ public class GetOrgIdSpnResult
     {
         private const string Display = "<issuer name=\"{0}\" displayName=\"{0}\" realm=\"{1}\" />";
 
-        public GetOrgIdSpnResult(Guid appId, string appDomain, Guid idpId, string entityId)
+        public GetOrgIdSpnResult(Guid appId, string appDomain, Guid idpId)
         {
             this.ApplicationId = appId;
             this.ApplicationDomain = appDomain;
-            this.Spn = string.Format("spn:{0}@{1}", appId, idpId);
+            this.Spn = string.Format("spn:{0}", appId);
         }
 
         public Guid ApplicationId { get; internal set; }
diff --git a/WAAD.WebSSO.PHP/php/code/samples/phpSample/federation.ini b/WAAD.WebSSO.PHP/php/code/samples/phpSample/federation.ini
index cb318f4..059945c 100644
--- a/WAAD.WebSSO.PHP/php/code/samples/phpSample/federation.ini
+++ b/WAAD.WebSSO.PHP/php/code/samples/phpSample/federation.ini
@@ -1,6 +1,6 @@
 federation.trustedissuers.issuer=https://accounts.accesscontrol.windows.net/v2/wsfederation
 federation.trustedissuers.thumbprint=3f5dfcdf4b3d0eab9ba49befb3cfd760da9cccf1
 federation.trustedissuers.friendlyname=Awesome Computers
-federation.audienceuris=spn:d184f6dd-d5d6-44c8-9cfa-e2d630dea392@495c4a5e-38b7-49b9-a90f-4c0050b2d7f7
+federation.audienceuris=spn:d184f6dd-d5d6-44c8-9cfa-e2d630dea392
 federation.realm=spn:d184f6dd-d5d6-44c8-9cfa-e2d630dea392@495c4a5e-38b7-49b9-a90f-4c0050b2d7f7
 federation.reply=https://localhost/phpSample/index.php
\ No newline at end of file