diff --git a/infra/main.bicep b/infra/main.bicep
index e909900f..911bb807 100644
--- a/infra/main.bicep
+++ b/infra/main.bicep
@@ -104,7 +104,7 @@ param enableScalability bool = false
 param aiDeploymentsLocation string
 
 @description('Optional created by user name')
-param createdBy string = empty(deployer().userPrincipalName) ? '' : split(deployer().userPrincipalName, '@')[0]
+param createdBy string = contains(deployer(), 'userPrincipalName')? split(deployer().userPrincipalName, '@')[0]: deployer().objectId
 
 // ========== Resource Group Tag ========== //
 resource resourceGroupTags 'Microsoft.Resources/tags@2021-04-01' = {