Fixed service email problem