Fix duplicate emails error message

Add more email types to spec

Remove commented line