Fixes cuurent user bug