Fixing isUser issue
Merge remote-tracking branch 'origin/In-progress'