current user bug fix