diff --git a/public/assets/pages/connectpage/ctrl_form.css b/public/assets/pages/connectpage/ctrl_form.css
index 77c7a5564..d9f9b1ca7 100644
--- a/public/assets/pages/connectpage/ctrl_form.css
+++ b/public/assets/pages/connectpage/ctrl_form.css
@@ -4,6 +4,9 @@
     box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2);
     background: white;
 }
+.component_page_connection_form .formbuilder:not(:empty) {
+    margin: 5px 0 10px 0;
+}
 .component_page_connection_form div.buttons {
     display: flex;
     margin: 0px 0px 15px 0px;
@@ -49,7 +52,6 @@
     padding-right: 10px;
 }
 .component_page_connection_form form button.emphasis {
-    margin-top: 10px;
     color: white;
     text-transform: uppercase;
 }
diff --git a/public/assets/pages/connectpage/ctrl_form.js b/public/assets/pages/connectpage/ctrl_form.js
index 85c2a61a6..ccfa9d852 100644
--- a/public/assets/pages/connectpage/ctrl_form.js
+++ b/public/assets/pages/connectpage/ctrl_form.js
@@ -68,7 +68,8 @@ export default async function(render) {
                 middleware: { type: "hidden" },
                 label: { type: "hidden", value: label },
             };
-            return backendSpecs[type];
+            const emptyForm = {};
+            return backendSpecs[type] || {};
         })),
     )));
     effect(getCurrentBackend().pipe(