Cleaned up a messy if-else block.

Added some form checking to the builder. Should really do this with a
FormValidation doCheckDaticalDBAction, but I'm having some issues with
validating radio buttons.