fix duplicate user/site issue