Handling case where the user is not present
Merge pull request #1935 from abhgupta/abhgupta-dev

Merged by openshift-bot