Fixed regex for email validation

[shivamdixit]

Fixed regex as explained in the issue tracker. Also removed trailing spaces.

[rash805115]

refer 244406b13821166e804eed7b282636b9289e51e6