diff --git a/src/app/components/ClientCard/OneTimeLink.vue b/src/app/components/ClientCard/OneTimeLink.vue
index b14c5aa0..4973b41e 100644
--- a/src/app/components/ClientCard/OneTimeLink.vue
+++ b/src/app/components/ClientCard/OneTimeLink.vue
@@ -13,7 +13,7 @@ const timer = ref<NodeJS.Timeout | null>(null);
 const { localeProperties } = useI18n();
 
 onMounted(() => {
-  timer.value = setInterval(() => {
+  timer.value = setIntervalImmediately(() => {
     if (props.client.oneTimeLink === null) {
       return;
     }
diff --git a/src/app/pages/setup/4.vue b/src/app/pages/setup/4.vue
index 4f9c14e0..40e22eef 100644
--- a/src/app/pages/setup/4.vue
+++ b/src/app/pages/setup/4.vue
@@ -50,6 +50,7 @@ const _submit = useSubmit(
         await navigateTo('/setup/success');
       }
     },
+    noSuccessToast: true,
   }
 );
 
diff --git a/src/app/pages/setup/migrate.vue b/src/app/pages/setup/migrate.vue
index 7eb5ddda..a1185bbd 100644
--- a/src/app/pages/setup/migrate.vue
+++ b/src/app/pages/setup/migrate.vue
@@ -42,6 +42,7 @@ const _submit = useSubmit(
         await navigateTo('/setup/success');
       }
     },
+    noSuccessToast: true,
   }
 );
 
diff --git a/src/server/utils/WireGuard.ts b/src/server/utils/WireGuard.ts
index 14e68934..488ad7aa 100644
--- a/src/server/utils/WireGuard.ts
+++ b/src/server/utils/WireGuard.ts
@@ -180,12 +180,11 @@ class WireGuard {
 
   // TODO: handle as worker_thread
   async startCronJob() {
-    await this.cronJob().catch((err) => {
-      WG_DEBUG('Running Cron Job failed.');
-      console.error(err);
-    });
-    setTimeout(() => {
-      this.startCronJob();
+    setIntervalImmediately(() => {
+      this.cronJob().catch((err) => {
+        WG_DEBUG('Running Cron Job failed.');
+        console.error(err);
+      });
     }, 60 * 1000);
   }
 
@@ -214,7 +213,6 @@ class WireGuard {
         client.oneTimeLink !== null &&
         new Date() > new Date(client.oneTimeLink.expiresAt)
       ) {
-        console.log(client);
         WG_DEBUG(`Client ${client.id} One Time Link expired.`);
         await Database.oneTimeLinks.delete(client.oneTimeLink.id);
       }
diff --git a/src/shared/utils/time.ts b/src/shared/utils/time.ts
index 3d4085e4..a7ac27c1 100644
--- a/src/shared/utils/time.ts
+++ b/src/shared/utils/time.ts
@@ -8,3 +8,8 @@ export function isPeerConnected(client: { latestHandshakeAt: Date | null }) {
   // connected if last handshake was less than 10 minutes ago
   return lastHandshakeMs < 1000 * 60 * 10;
 }
+
+export function setIntervalImmediately(func: () => void, interval: number) {
+  func();
+  return setInterval(func, interval);
+}