Added Log on Script Abort

Also added username in the logging params
Sync with latest linux script