Refactored domain form #3887

Instead of having three conditions and putting the form three tabs deep, bail out early if the conditions aren't met.