diff --git a/webui/src/views/AddPlanModal.tsx b/webui/src/views/AddPlanModal.tsx
index 5c3d90a98..5289f00c9 100644
--- a/webui/src/views/AddPlanModal.tsx
+++ b/webui/src/views/AddPlanModal.tsx
@@ -392,16 +392,6 @@ export const AddPlanModal = ({
             </Form.Item>
           </Tooltip>
 
-          {/* Plan.retention */}
-          <RetentionPolicyView />
-
-          {/* Plan.hooks */}
-          <Form.Item
-            label={<Tooltip title={hooksListTooltipText}>Hooks</Tooltip>}
-          >
-            <HooksFormList />
-          </Form.Item>
-
           {/* Plan.backup_flags */}
           <Form.Item label={<Tooltip title="Extra flags to add to the 'restic backup' command">Backup Flags</Tooltip>}>
             <Form.List
@@ -450,6 +440,16 @@ export const AddPlanModal = ({
             </Form.List>
           </Form.Item>
 
+          {/* Plan.retention */}
+          <RetentionPolicyView />
+
+          {/* Plan.hooks */}
+          <Form.Item
+            label={<Tooltip title={hooksListTooltipText}>Hooks</Tooltip>}
+          >
+            <HooksFormList />
+          </Form.Item>
+
           <Form.Item shouldUpdate label="Preview">
             {() => (
               <Collapse
diff --git a/webui/src/views/AddRepoModal.tsx b/webui/src/views/AddRepoModal.tsx
index 34bb39783..d99f8908b 100644
--- a/webui/src/views/AddRepoModal.tsx
+++ b/webui/src/views/AddRepoModal.tsx
@@ -283,7 +283,6 @@ export const AddRepoModal = ({
               {(fields, { add, remove }, { errors }) => (
                 <>
                   {fields.map((field, index) => (
-                    console.log("FIELD: ", field),
                     <Form.Item key={field.key}>
                       <Form.Item
                         {...field}
@@ -315,7 +314,7 @@ export const AddRepoModal = ({
                   <Form.Item>
                     <Button
                       type="dashed"
-                      onClick={() => add("THIS IS A NEW VALUE")}
+                      onClick={() => add("")}
                       style={{ width: "90%" }}
                       icon={<PlusOutlined />}
                     >
@@ -488,8 +487,9 @@ const envVarSetValidator = (form: FormInstance<FormData>, envVars: string[]) =>
   });
 
   // check that password is provided in some form
+  const password = form.getFieldValue("password");
   if (
-    form.getFieldValue("password").length === 0 &&
+    (!password || password.length === 0) &&
     !envVarNames.includes("RESTIC_PASSWORD") &&
     !envVarNames.includes("RESTIC_PASSWORD_COMMAND") &&
     !envVarNames.includes("RESTIC_PASSWORD_FILE")