diff --git a/dashboard/src/components/AppImportDialog.vue b/dashboard/src/components/AppImportDialog.vue
index 9b19b3582..9be5d5766 100644
--- a/dashboard/src/components/AppImportDialog.vue
+++ b/dashboard/src/components/AppImportDialog.vue
@@ -1,6 +1,6 @@
 <script setup>
 
-import { ref, useTemplateRef } from 'vue';
+import { ref, useTemplateRef, watchEffect } from 'vue';
 import { Dialog, FormGroup, TextInput, PasswordInput, Checkbox } from '@cloudron/pankow';
 import { s3like, mountlike, parseFullBackupPath } from  '../utils.js';
 import BackupProviderForm from './BackupProviderForm.vue';
@@ -25,7 +25,7 @@ const encryptionPassword = ref('');
 const encryptedFilenames = ref(false);
 
 const isFormValid = ref(false);
-async function validateForm() {
+function validateForm() {
   isFormValid.value = form.value && form.value.checkValidity();
 }
 
@@ -261,6 +261,10 @@ function onUploadBackupConfig() {
   backupConfigInput.value.click();
 }
 
+watchEffect(() => {
+  if (providerConfig.value.credentials) setTimeout(validateForm, 100);
+});
+
 defineExpose({
   async open(id) {
     appId.value = id;
diff --git a/dashboard/src/components/DomainDialog.vue b/dashboard/src/components/DomainDialog.vue
index 370582dac..fdedf4f85 100644
--- a/dashboard/src/components/DomainDialog.vue
+++ b/dashboard/src/components/DomainDialog.vue
@@ -1,6 +1,6 @@
 <script setup>
 
-import { ref, useTemplateRef } from 'vue';
+import { ref, useTemplateRef, watchEffect } from 'vue';
 import { Dialog, TextInput, InputGroup, FormGroup, Button } from '@cloudron/pankow';
 import { getTextFromFile } from '../utils.js';
 import DomainsModel from '../models/DomainsModel.js';
@@ -99,6 +99,10 @@ function onKeyFileChange() {
   keyFileName.value = file ? file.name : '';
 }
 
+watchEffect(() => {
+  if (dnsConfig.value.credentials) setTimeout(checkValidity, 100);
+});
+
 defineExpose({
   open(d) {
     d = d ? JSON.parse(JSON.stringify(d)) : { config: {}, tlsConfig: { provider: 'letsencrypt-prod', wildcard: true } }; // make a copy
diff --git a/dashboard/src/views/RestoreView.vue b/dashboard/src/views/RestoreView.vue
index 2c0f42a3f..dca885c09 100644
--- a/dashboard/src/views/RestoreView.vue
+++ b/dashboard/src/views/RestoreView.vue
@@ -1,6 +1,6 @@
 <script setup>
 
-import { ref, onMounted, useTemplateRef } from 'vue';
+import { ref, onMounted, useTemplateRef, watchEffect } from 'vue';
 import { Notification, Button, SingleSelect, FormGroup, PasswordInput, TextInput, Checkbox } from '@cloudron/pankow';
 import { copyToClipboard } from '@cloudron/pankow/utils';
 import { REGIONS_CONTABO, REGIONS_VULTR, REGIONS_IONOS, REGIONS_OVH, REGIONS_LINODE, REGIONS_SCALEWAY, REGIONS_WASABI } from '../constants.js';
@@ -46,7 +46,6 @@ const siteId = ref('');
 const form = useTemplateRef('form');
 const isFormValid = ref(false);
 function checkValidity() {
-  if (!provider.value) return false;
   isFormValid.value = form.value.checkValidity();
 }
 
@@ -321,6 +320,10 @@ function onCopyToClipboard(value) {
   window.pankow.notify('Copied');
 }
 
+watchEffect(() => {
+  if (providerConfig.value.credentials) setTimeout(checkValidity, 100);
+});
+
 onMounted(async () => {
   const [error, status] = await provisionModel.status();
   if (error) return console.error(error);
diff --git a/dashboard/src/views/SetupView.vue b/dashboard/src/views/SetupView.vue
index e035496f8..a190ff874 100644
--- a/dashboard/src/views/SetupView.vue
+++ b/dashboard/src/views/SetupView.vue
@@ -1,6 +1,6 @@
 <script setup>
 
-import { ref, onMounted, useTemplateRef } from 'vue';
+import { ref, onMounted, useTemplateRef, watchEffect } from 'vue';
 import { Button, SingleSelect, FormGroup, TextInput, Notification } from '@cloudron/pankow';
 import { copyToClipboard } from '@cloudron/pankow/utils';
 import { redirectIfNeeded } from '../utils.js';
@@ -44,7 +44,6 @@ const ipv6Interface = ref('');
 const form = useTemplateRef('form');
 const isFormValid = ref(false);
 function checkValidity() {
-  if (!provider.value) return false;
   isFormValid.value = form.value.checkValidity();
 }
 
@@ -129,6 +128,10 @@ function onCopyToClipboard(value) {
   window.pankow.notify('Copied');
 }
 
+watchEffect(() => {
+  if (dnsConfig.value.credentials) setTimeout(checkValidity, 100);
+});
+
 onMounted(async () => {
   const search = decodeURIComponent(window.location.search).slice(1).split('&').map(function (item) { return item.split('='); }).reduce(function (o, k) { o[k[0]] = k[1]; return o; }, {});