Added Check for Email (@ + .) + Cleanup in Verify