solved currentUsers issue
Merge branch 'currentUsersFix2'
resolved conflicts