diff --git a/src/pages/company_edit.rs b/src/pages/company_edit.rs
index 964e109..b07c6d8 100644
--- a/src/pages/company_edit.rs
+++ b/src/pages/company_edit.rs
@@ -41,7 +41,7 @@ pub fn CompanyEdit(
                             id="nameWithTitle"
                             class="form-control"
                             placeholder="Enter Name"
-                            value={move || company.get().name}
+                            prop:value={move || company.get().name}
                             name="company[name]"
                         />
                     </div>
@@ -54,7 +54,7 @@ pub fn CompanyEdit(
                             id="street"
                             class="form-control"
                             placeholder="Enter Street"
-                            value={move || company.get().street}
+                            prop:value={move || company.get().street}
                             name="company[street]"
                         />
                     </div>
@@ -65,7 +65,7 @@ pub fn CompanyEdit(
                             id="houseNumber"
                             class="form-control"
                             placeholder="Enter House number"
-                            value={move || company.get().house_number}
+                            prop:value={move || company.get().house_number}
                             name="company[house_number]"
                         />
                     </div>
@@ -78,7 +78,7 @@ pub fn CompanyEdit(
                             id="zip"
                             class="form-control"
                             placeholder="Enter ZIP code"
-                            value={move || company.get().zip_code}
+                            prop:value={move || company.get().zip_code}
                             name="company[zip_code]"
                         />
                     </div>
@@ -89,14 +89,15 @@ pub fn CompanyEdit(
                             id="city"
                             class="form-control"
                             placeholder="Enter City"
-                            value={move || company.get().city}
+                            prop:value={move || company.get().city}
                             name="company[city]"
                         />
                     </div>
                 </div>
             </ModalBody>
             <ModalFooter>
-                <button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal" on:click=move |_| opener.hide()>
+                <button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal"
+                    on:click=move |_| {validator.reset(); opener.hide()}>
                     {trl("Close")}
                 </button>
                 <button type="submit" class="btn btn-primary">
diff --git a/src/validator.rs b/src/validator.rs
index dd3cf69..91787fa 100644
--- a/src/validator.rs
+++ b/src/validator.rs
@@ -58,4 +58,8 @@ impl Validator {
     pub fn messages(&self) -> Option<Vec<String>> {
         self.messages.get()
     }
+
+    pub fn reset(&self) {
+        self.set_valid.update(|v| *v = true);
+    }
 }
\ No newline at end of file