Improve regex to catch foo@bar..com and add test for downcase before save