Fix current_user bug