Prevent resetting active domain without need

I checked how it happened that the active domain is reset in those two places. Here are respective commits: 32920b2f and ac6552da, and it looks like we should simply check whether a domain is previously set before resetting it. Please see MR !130 for the suggested change.