Ajay/Melanie | #2501 | Bugfix - Filtering user based on rep and org id