Update Client to get Organization ID