Fix for duplicate users, System email ON