Simplified the validation in the dialog.

TODO: Fix failing e2e tests.