CHANGE: CHanging the MailAddressValidator a little bit. Test are wrking fine :-)