fixed duplicated emails issue