Fix issue with local vs global variables
Try org lookup by ORG_NAME, if fails, try user lookup by ORG_NAME