Hmm, does this fix the duped users issue?