Fix TAG in account service as well