Totally rework the dup user check