Solving also mail entered as plain text of type myname@domain.com