upload email id engine: small bugs