Bug 873295 - Defer duplicate checks until after authentication