revert back to location var check on EVT_CLIENT_CONNECT