Fix the current_user bug