diff --git a/src/GuardrailsSolutionAcceleratorSetup/modules/Confirm-GSAConfigurationParameters/Confirm-GSAConfigurationParameters.psm1 b/src/GuardrailsSolutionAcceleratorSetup/modules/Confirm-GSAConfigurationParameters/Confirm-GSAConfigurationParameters.psm1
index ce01317d..9863adc7 100644
--- a/src/GuardrailsSolutionAcceleratorSetup/modules/Confirm-GSAConfigurationParameters/Confirm-GSAConfigurationParameters.psm1
+++ b/src/GuardrailsSolutionAcceleratorSetup/modules/Confirm-GSAConfigurationParameters/Confirm-GSAConfigurationParameters.psm1
@@ -354,7 +354,8 @@ Function Confirm-GSAConfigurationParameters {
         $userId = $sp.Id
     }
     ElseIf ($context.Account.Type -eq 'ClientAssertion') { # Federated Identity
-        $userId = $context.Account.Id
+        $sp = Get-AzADServicePrincipal -ApplicationId $context.Account.Id
+        $userId = $sp.Id
     }
     Else {
         Write-Verbose "Context is Local."