Fixes to duplicate user checking.