Fix registration code path for mobile services