Fixing email validation see BT#8676