Regular expresion added to validate email id. password generator
functionaltiy modified.

Signed-off-by: Sanjay Madnani <http://sanjaymadnani.wordpress.com/>