Current user bug fix