diff --git a/scripts/Common/Scripts/Operations.ps1 b/scripts/Common/Scripts/Operations.ps1
index cd41f864..3ed7d079 100644
--- a/scripts/Common/Scripts/Operations.ps1
+++ b/scripts/Common/Scripts/Operations.ps1
@@ -49,7 +49,7 @@ $null = New-Module {
         $action = New-ScheduledTaskAction -Execute "pwsh" -Argument (Get-StartupArguments);
         schtasks /Create /SC ONEVENT /EC $logName /MO "*[System[Provider[@Name='$logName'] and EventID=$($oneShotTrigger)]]" /TR cmd.exe /TN $tempTask;
         $trigger = (Get-ScheduledTask $tempTask).Triggers;
-        $principal = New-ScheduledTaskPrincipal -UserId (Get-SetupUser) -RunLevel Highest;
+        $principal = New-ScheduledTaskPrincipal -UserId "SYSTEM" -RunLevel Highest;
         $task = New-ScheduledTask -Action $action -Principal $principal -Trigger $trigger;
         $null = Register-ScheduledTask -Force $oneShotTaskName -InputObject $task;
         $null = Unregister-ScheduledTask -Confirm:$false $tempTask;
@@ -93,6 +93,7 @@ $null = New-Module {
 
             Start-Job {
                 Wait-Event -SourceIdentifier $identifier;
+                Wait-Event -SourceIdentifier $identifier;
             };
         };