Add things missing from previous commit to add realm_name to the service name.