#612, #740, #741: Fix the issue which email@server is not valid email address, thanks to @kromit