Merge pull request #18152 from alivedise/bugzilla/825435/dupe-alert

Bug 994537 - Fix dupe alert, r=timdream