put user.name back in