diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 36824ccd..b6d6a501 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -512,4 +512,4 @@ jobs:
 
           curl -X POST "${{ secrets.LOGIC_APP_URL }}" \
             -H "Content-Type: application/json" \
-            -d "$EMAIL_BODY" || echo "Failed to send notification"
\ No newline at end of file
+            -d "$EMAIL_BODY" || echo "Failed to send notification"
diff --git a/infra/main.bicep b/infra/main.bicep
index abd6f125..4c971ec5 100644
--- a/infra/main.bicep
+++ b/infra/main.bicep
@@ -418,8 +418,9 @@ module applicationInsights 'br/public:avm/res/insights/component:0.6.0' = {
   }
 }
 
-@description('Optional created by user name')
-param createdBy string = empty(deployer().userPrincipalName) ? '' : split(deployer().userPrincipalName, '@')[0]
+@description('Tag, Created by user name')
+param createdBy string = contains(deployer(), 'userPrincipalName')? split(deployer().userPrincipalName, '@')[0]: deployer().objectId
+
 // ========== Resource Group Tag ========== //
 resource resourceGroupTags 'Microsoft.Resources/tags@2021-04-01' = {
   name: 'default'