Department validation tweaks
Department validation tweaks