Revert "removing validation, adding unique entry to alert"

This reverts commit 3101d81fcf90e276a69d237d87211e510dfde5c3.