Correct email validation

Change-Id: I84f55012e7f7a102b4218966f0395936540dc06e