Merge pull request #7939 from hereabdulla/patch-2

Only enabled user to be fetched