Simplfied and fixed email checking.
Simplfied and fixed email checking.

EduPepperPDTesting/pepper2013-testing,EduPepperPDTesting/pepper2013-testing,EduPepperPDTesting/pepper2013-testing,EduPepperPDTesting/pepper2013-testing,EduPepperPDTesting/pepper2013-testing,EduPepperPDTesting/pepper2013-testing