diff --git a/client/app.vue b/client/app.vue
index 7cc46c24..722d9fbd 100644
--- a/client/app.vue
+++ b/client/app.vue
@@ -48,9 +48,11 @@
     <ToolsStopImpersonation />
 
     <NotificationsWrapper />
-    <feature-base />
-    <SubscriptionModal />
-    <QuickRegister />
+    <ClientOnly>
+      <feature-base />
+      <SubscriptionModal />
+      <QuickRegister />
+    </ClientOnly>
   </div>
 </template>
 
diff --git a/client/components/open/forms/OpenCompleteForm.vue b/client/components/open/forms/OpenCompleteForm.vue
index ec8ae91e..1eef8df7 100644
--- a/client/components/open/forms/OpenCompleteForm.vue
+++ b/client/components/open/forms/OpenCompleteForm.vue
@@ -19,12 +19,10 @@
     </ClientOnly>
 
     <v-transition name="fade" mode="out-in">
-      <!-- Auto-submit loading state -->
       <div v-if="isAutoSubmit" key="auto-submit" class="text-center p-6">
         <Loader class="h-6 w-6 text-nt-blue mx-auto" />
       </div>
 
-      <!-- Main form content -->
       <div v-else key="form-content">
         <div v-if="isPublicFormPage && form.is_password_protected">
           <p class="form-description text-gray-700 dark:text-gray-300 px-2">