Use filter_var for email validation  (fixes #2321)

Signed-off-by: John Rayes <live627@gmail.com>
Tweak the display title (#2319)

Signed-off-by: John Rayes <live627@gmail.com>
Merge pull request #2325 from live627/release-2.1a

Some small changes