The GOTOs should be removed and the SET statements would belong into the appropriate IF-ELSE-ENDIF sections.
RunLogonScriptSync can also be implemented on a per-user setting if the user is not admin but should be deployed via LPO/GPO.
_________________________
There are two types of vessels, submarines and targets.
