Fix syntax error at line 238
Also support user as ORG_NAME if org lookup fails