Cannot add international email address in Create Merchant Dialog

The user will get an error if they try to create an international type email address or any email address with more than one octet in it.

For example:
user@tsa.co.uk
user@tsa.co.jp
user@mailserver.tsa.com

These don't work since the validation algorithm only allows for one '.' not two. Not sure if we need to allow for more than two or not.