diff --git a/frontend/src/App.js b/frontend/src/App.js
index e91fbfd937..58b24eb2e7 100644
--- a/frontend/src/App.js
+++ b/frontend/src/App.js
@@ -40,6 +40,8 @@ import PrintBarcode from "./components/printBarcode/Index";
 import NonConformIndex from "./components/nonconform/index";
 import SampleBatchEntrySetup from "./components/batchOrderEntry/SampleBatchEntrySetup.js";
 import AuditTrailReportIndex from "./components/reports/auditTrailReport/Index.js";
+import AddOrganization from "./components/admin/OrganizationManagament/AddOrganization.js";
+import ModifyOrganization from "./components/admin/OrganizationManagament/ModifyOrganization.js";
 
 export default function App() {
   let i18nConfig = {
@@ -226,6 +228,18 @@ export default function App() {
                   component={() => <Admin />}
                   role="Global Administrator"
                 />
+                <SecureRoute
+                  path="/AddOrganization"
+                  exact
+                  component={() => <AddOrganization />}
+                  role="Global Administrator"
+                />
+                <SecureRoute
+                  path="/ModifyOrganization"
+                  exact
+                  component={() => <ModifyOrganization />}
+                  role="Global Administrator"
+                />
                 <SecureRoute
                   path="/PathologyDashboard"
                   exact
diff --git a/frontend/src/components/admin/OrganizationManagament/AddOrganization.js b/frontend/src/components/admin/OrganizationManagament/AddOrganization.js
index fd93990023..fedc5f2d60 100644
--- a/frontend/src/components/admin/OrganizationManagament/AddOrganization.js
+++ b/frontend/src/components/admin/OrganizationManagament/AddOrganization.js
@@ -24,6 +24,7 @@ import {
 import {
   getFromOpenElisServer,
   postToOpenElisServerFullResponse,
+  postToOpenElisServerJsonResponse,
 } from "../../utils/Utils.js";
 import { NotificationContext } from "../../layout/Layout.js";
 import {
@@ -47,18 +48,57 @@ function AddOrganization() {
   const intl = useIntl();
   const [loading, setLoading] = useState(true);
   const [page, setPage] = useState(1);
-  const [pageSize, setPageSize] = useState(5);
+  const [pageSize, setPageSize] = useState(20);
   const [selectedRowIds, setSelectedRowIds] = useState([]);
   const [saveButton, setSaveButton] = useState(true);
   const [newOrganizationsData, setNewOrganizationsData] = useState(null);
   const [typeOfActivity, setTypeOfActivity] = useState(null);
   const [typeOfActivityShow, setTypeOfActivityShow] = useState([]);
 
-  const handlePageChange = ({ page, pageSize }) => {
-    setPage(page);
-    setPageSize(pageSize);
-    setSelectedRowIds([]);
-  };
+  // const handlePageChange = ({ page, pageSize }) => {
+  //   setPage(page);
+  //   setPageSize(pageSize);
+  //   setSelectedRowIds([]);
+  // };
+
+  function handleOrgNameChange(e) {
+    setSaveButton(false);
+    setNewOrganizationsData((alreadyOrgInfoToPost) => ({
+      ...alreadyOrgInfoToPost,
+      organizationName: e.target.value,
+    }));
+  }
+
+  function handleOrgPrefixChange(e) {
+    setSaveButton(false);
+    setNewOrganizationsData((alreadyOrgInfoToPost) => ({
+      ...alreadyOrgInfoToPost,
+      shortName: e.target.value,
+    }));
+  }
+
+  function handleIsActiveChange(e) {
+    setSaveButton(false);
+    setNewOrganizationsData((alreadyOrgInfoToPost) => ({
+      ...alreadyOrgInfoToPost,
+      isActive: e.target.value,
+    }));
+  }
+
+  function handleInternetAddressChange(e) {
+    setSaveButton(false);
+    setNewOrganizationsData((alreadyOrgInfoToPost) => ({
+      ...alreadyOrgInfoToPost,
+      internetAddress: e.target.value,
+    }));
+  }
+
+  useEffect(() => {
+    setNewOrganizationsData((alreadyOrgInfoToPost) => ({
+      ...alreadyOrgInfoToPost,
+      selectedTypes: selectedRowIds,
+    }));
+  }, [selectedRowIds, typeOfActivity, typeOfActivityShow]);
 
   useEffect(() => {
     if (typeOfActivity) {
@@ -75,6 +115,15 @@ function AddOrganization() {
         newOrganizationsManagementList,
       );
       setTypeOfActivityShow(newOrganizationsManagementListArray);
+
+      const newOrganizationsManagementDataPost = {
+        id: typeOfActivity.id,
+        organizationName: typeOfActivity.organizationName || "",
+        shortName: typeOfActivity.shortName || "",
+        isActive: typeOfActivity.isActive || "",
+        internetAddress: typeOfActivity.internetAddress || "",
+      };
+      setNewOrganizationsData(newOrganizationsManagementDataPost);
     }
   }, [typeOfActivity]);
 
@@ -102,26 +151,30 @@ function AddOrganization() {
   function newOrganizationsSavePost(event) {
     event.preventDefault();
     setLoading(true);
-    postToOpenElisServerFullResponse(
+    postToOpenElisServerJsonResponse(
       `/rest/Organization?ID=0&startingRecNo=1`,
-      newOrganizationsData, // need to check against the form of restController [mentor]
-      setLoading(false),
-      addNotification({
-        title: intl.formatMessage({
-          id: "notification.title",
-        }),
-        message: intl.formatMessage({
-          id: "notification.organization.post.save.success",
-        }),
-        kind: NotificationKinds.success,
-      }),
-      setNotificationVisible(true),
-      setTimeout(() => {
-        window.location.reload();
-      }, 2000),
+      JSON.stringify(newOrganizationsData),
+      newOrganizationsSavePostCallback(),
     );
   }
 
+  function newOrganizationsSavePostCallback() {
+    setLoading(false);
+    setNotificationVisible(true);
+    addNotification({
+      title: intl.formatMessage({
+        id: "notification.title",
+      }),
+      message: intl.formatMessage({
+        id: "notification.organization.post.save.success",
+      }),
+      kind: NotificationKinds.success,
+    });
+    // setTimeout(() => {
+    //   window.location.reload();
+    // }, 2000);
+  }
+
   const renderCell = (cell, row) => {
     if (cell.info.header === "select") {
       return (
@@ -196,10 +249,7 @@ function AddOrganization() {
                         id: "organization.add.placeholder",
                       })}
                       required
-                      // invalid={errors.order && touched.order}
-                      // invalidText={errors.order}
-                      // value={values.numDefaultOrderLabels}
-                      // onChange={(e) => handleDefaultOrderLablesValue(e)}
+                      onChange={(e) => handleOrgNameChange(e)}
                     />
                   </Column>
                 </Grid>
@@ -218,10 +268,7 @@ function AddOrganization() {
                       placeholder={intl.formatMessage({
                         id: "organization.add.placeholder",
                       })}
-                      // invalid={errors.order && touched.order}
-                      // invalidText={errors.order}
-                      // value={values.numDefaultOrderLabels}
-                      // onChange={(e) => handleDefaultOrderLablesValue(e)}
+                      onChange={(e) => handleOrgPrefixChange(e)}
                     />
                   </Column>
                 </Grid>
@@ -242,10 +289,7 @@ function AddOrganization() {
                         id: "organization.add.placeholder.active",
                       })}
                       required
-                      // invalid={errors.order && touched.order}
-                      // invalidText={errors.order}
-                      // value={values.numDefaultOrderLabels}
-                      // onChange={(e) => handleDefaultOrderLablesValue(e)}
+                      onChange={(e) => handleIsActiveChange(e)}
                     />
                   </Column>
                 </Grid>
@@ -265,10 +309,7 @@ function AddOrganization() {
                       placeholder={intl.formatMessage({
                         id: "organization.add.placeholder",
                       })}
-                      // invalid={errors.order && touched.order}
-                      // invalidText={errors.order}
-                      // value={values.numDefaultOrderLabels}
-                      // onChange={(e) => handleDefaultOrderLablesValue(e)}
+                      onChange={(e) => handleInternetAddressChange(e)}
                     />
                   </Column>
                 </Grid>
@@ -295,6 +336,7 @@ function AddOrganization() {
           <br />
           <Grid fullWidth={true} className="gridBoundary">
             <Column lg={16} md={8} sm={4}>
+              <br />
               <DataTable
                 rows={typeOfActivityShow.slice(
                   // need a change
@@ -419,7 +461,7 @@ function AddOrganization() {
                   </TableContainer>
                 )}
               </DataTable>
-              <Pagination
+              {/* <Pagination
                 onChange={handlePageChange}
                 page={page}
                 pageSize={pageSize}
@@ -461,7 +503,8 @@ function AddOrganization() {
                     { page: pagesUnknown ? "" : page },
                   )
                 }
-              />
+              /> */}
+              <br />
             </Column>
           </Grid>
           <br />
@@ -493,12 +536,16 @@ function AddOrganization() {
         >
           sdf
         </button>
+        <button
+          onClick={() => {
+            console.error(newOrganizationsData);
+          }}
+        >
+          postData
+        </button>
       </div>
     </>
   );
 }
 
 export default injectIntl(AddOrganization);
-
-// post request need to fix
-// save button fix needed
diff --git a/frontend/src/components/admin/OrganizationManagament/ModifyOrganization.js b/frontend/src/components/admin/OrganizationManagament/ModifyOrganization.js
index af1601cd68..e132fdeb33 100644
--- a/frontend/src/components/admin/OrganizationManagament/ModifyOrganization.js
+++ b/frontend/src/components/admin/OrganizationManagament/ModifyOrganization.js
@@ -24,7 +24,7 @@ import {
 } from "@carbon/react";
 import {
   getFromOpenElisServer,
-  postToOpenElisServerFullResponse,
+  postToOpenElisServerJsonResponse,
 } from "../../utils/Utils.js";
 import { NotificationContext } from "../../layout/Layout.js";
 import {
@@ -48,13 +48,13 @@ function ModifyOrganization() {
   const intl = useIntl();
   const [loading, setLoading] = useState(true);
   const [page, setPage] = useState(1);
-  const [pageSize, setPageSize] = useState(5);
+  const [pageSize, setPageSize] = useState(20);
   const [selectedRowIds, setSelectedRowIds] = useState([]);
   const [orgSelectedTypeOfActivity, setOrgSelectedTypeOfActivity] = useState(
     [],
   );
   const [orgInfo, setOrgInfo] = useState(null);
-  const [orgInfoPost, setOrgInfoPost] = useState(null); // post data need to get checked
+  const [orgInfoPost, setOrgInfoPost] = useState(null);
   const [saveButton, setSaveButton] = useState(true);
   const [typeOfActivity, setTypeOfActivity] = useState(null);
   const [typeOfActivityShow, setTypeOfActivityShow] = useState([]);
@@ -73,34 +73,93 @@ function ModifyOrganization() {
     );
   }
 
-  const handlePageChange = ({ page, pageSize }) => {
-    setPage(page);
-    setPageSize(pageSize);
-    setSelectedRowIds([]);
-  };
+  // const handlePageChange = ({ page, pageSize }) => {
+  //   setPage(page);
+  //   setPageSize(pageSize);
+  //   setSelectedRowIds([]);
+  // };
+
+  function handleOrgNameChange(e) {
+    setSaveButton(false);
+    setOrgInfoPost((prevOrgInfoPost) => ({
+      ...prevOrgInfoPost,
+      organizationName: e.target.value,
+    }));
+    setOrgInfo((prevOrgInfo) => ({
+      ...prevOrgInfo,
+      organizationName: e.target.value,
+    }));
+  }
+
+  function handleOrgPrefixChange(e) {
+    setSaveButton(false);
+    setOrgInfoPost((prevOrgInfoPost) => ({
+      ...prevOrgInfoPost,
+      shortName: e.target.value,
+    }));
+    setOrgInfo((prevOrgInfo) => ({
+      ...prevOrgInfo,
+      shortName: e.target.value,
+    }));
+  }
+
+  function handleIsActiveChange(e) {
+    setSaveButton(false);
+    setOrgInfoPost((prevOrgInfoPost) => ({
+      ...prevOrgInfoPost,
+      isActive: e.target.value,
+    }));
+    setOrgInfo((prevOrgInfo) => ({
+      ...prevOrgInfo,
+      isActive: e.target.value,
+    }));
+  }
+
+  function handleInternetAddressChange(e) {
+    setSaveButton(false);
+    setOrgInfoPost((prevOrgInfoPost) => ({
+      ...prevOrgInfoPost,
+      internetAddress: e.target.value,
+    }));
+    setOrgInfo((prevOrgInfo) => ({
+      ...prevOrgInfo,
+      internetAddress: e.target.value,
+    }));
+  }
 
   function submitUpdatedOrgInfo() {
     setLoading(true);
-    postToOpenElisServerFullResponse(
+    postToOpenElisServerJsonResponse(
       `/rest/Organization?ID=${id}&startingRecNo=1`,
-      orgInfoPost,
-      setLoading(false),
-      addNotification({
-        title: intl.formatMessage({
-          id: "notification.title",
-        }),
-        message: intl.formatMessage({
-          id: "notification.organization.post.success",
-        }),
-        kind: NotificationKinds.success,
-      }),
-      setNotificationVisible(true),
-      setTimeout(() => {
-        window.location.reload();
-      }, 1000),
+      JSON.stringify(orgInfoPost),
+      submitUpdatedOrgInfoCallback(),
     );
   }
 
+  function submitUpdatedOrgInfoCallback() {
+    setLoading(false);
+    setNotificationVisible(true);
+    addNotification({
+      title: intl.formatMessage({
+        id: "notification.title",
+      }),
+      message: intl.formatMessage({
+        id: "notification.organization.post.success",
+      }),
+      kind: NotificationKinds.success,
+    });
+    // setTimeout(() => {
+    //   window.location.reload();
+    // }, 2000);
+  }
+
+  useEffect(() => {
+    setOrgInfoPost((prevOrgInfoPost) => ({
+      ...prevOrgInfoPost,
+      selectedTypes: selectedRowIds,
+    }));
+  }, [selectedRowIds, orgSelectedTypeOfActivity, orgInfo]);
+
   useEffect(() => {
     if (typeOfActivity) {
       const newOrganizationsManagementList = typeOfActivity.orgTypes.map(
@@ -123,8 +182,19 @@ function ModifyOrganization() {
         shortName: typeOfActivity.shortName || "",
         isActive: typeOfActivity.isActive || "",
         internetAddress: typeOfActivity.internetAddress || "",
+        selectedTypes: typeOfActivity.selectedTypes || [],
+      };
+
+      const organizationsManagementIdInfoPost = {
+        id: typeOfActivity.id,
+        organizationName: typeOfActivity.organizationName || "",
+        shortName: typeOfActivity.shortName || "",
+        isActive: typeOfActivity.isActive || "",
+        internetAddress: typeOfActivity.internetAddress || "",
       };
       setOrgInfo(organizationsManagementIdInfo);
+      setOrgInfoPost(organizationsManagementIdInfoPost);
+      setSelectedRowIds(typeOfActivity.selectedTypes);
 
       const organizationSelectedTypeOfActivity =
         typeOfActivity.selectedTypes.map((item) => {
@@ -238,7 +308,7 @@ function ModifyOrganization() {
                         // invalid={errors.order && touched.order}
                         // invalidText={errors.order}
                         value={orgInfo.organizationName}
-                        // onChange={(e) => handleDefaultOrderLablesValue(e)}
+                        onChange={(e) => handleOrgNameChange(e)}
                       />
                     )}
                   </Column>
@@ -262,7 +332,7 @@ function ModifyOrganization() {
                         // invalid={errors.order && touched.order}
                         // invalidText={errors.order}
                         value={orgInfo.shortName}
-                        // onChange={(e) => handleDefaultOrderLablesValue(e)}
+                        onChange={(e) => handleOrgPrefixChange(e)}
                       />
                     )}
                   </Column>
@@ -288,7 +358,7 @@ function ModifyOrganization() {
                         // invalid={errors.order && touched.order}
                         // invalidText={errors.order}
                         value={orgInfo.isActive}
-                        // onChange={(e) => handleDefaultOrderLablesValue(e)}
+                        onChange={(e) => handleIsActiveChange(e)}
                       />
                     )}
                   </Column>
@@ -312,7 +382,7 @@ function ModifyOrganization() {
                         // invalid={errors.order && touched.order}
                         // invalidText={errors.order}
                         value={orgInfo.internetAddress}
-                        // onChange={(e) => handleDefaultOrderLablesValue(e)}
+                        onChange={(e) => handleInternetAddressChange(e)}
                       />
                     )}
                   </Column>
@@ -340,6 +410,7 @@ function ModifyOrganization() {
           <br />
           <Grid fullWidth={true} className="gridBoundary">
             <Column lg={16} md={8} sm={4}>
+              <br />
               <DataTable
                 rows={typeOfActivityShow.slice(
                   // need a change
@@ -464,7 +535,7 @@ function ModifyOrganization() {
                   </TableContainer>
                 )}
               </DataTable>
-              <Pagination
+              {/* <Pagination
                 onChange={handlePageChange}
                 page={page}
                 pageSize={pageSize}
@@ -506,13 +577,18 @@ function ModifyOrganization() {
                     { page: pagesUnknown ? "" : page },
                   )
                 }
-              />
+              /> */}
+              <br />
             </Column>
           </Grid>
           <br />
           <Grid fullWidth={true}>
             <Column lg={16} md={8} sm={4}>
-              <Button onClick={submitUpdatedOrgInfo} type="button">
+              <Button
+                disabled={saveButton}
+                onClick={submitUpdatedOrgInfo}
+                type="button"
+              >
                 Save
               </Button>{" "}
               <Button
@@ -562,13 +638,16 @@ function ModifyOrganization() {
         >
           selectedRowIds
         </button>
+        <button
+          onClick={() => {
+            console.log(orgInfoPost);
+          }}
+        >
+          orgInfoPost
+        </button>
       </div>
     </>
   );
 }
 
 export default injectIntl(ModifyOrganization);
-
-// fetch and set fix
-// values need to be marked [de constrution of selected row ids]
-// post data to be setted
diff --git a/frontend/src/components/admin/OrganizationManagament/OrganizationManagament.js b/frontend/src/components/admin/OrganizationManagament/OrganizationManagament.js
index bacf3957e0..39261385d9 100644
--- a/frontend/src/components/admin/OrganizationManagament/OrganizationManagament.js
+++ b/frontend/src/components/admin/OrganizationManagament/OrganizationManagament.js
@@ -22,7 +22,10 @@ import {
 } from "@carbon/react";
 import {
   getFromOpenElisServer,
+  postToOpenElisServer,
+  postToOpenElisServerFormData,
   postToOpenElisServerFullResponse,
+  postToOpenElisServerJsonResponse,
 } from "../../utils/Utils.js";
 import { NotificationContext } from "../../layout/Layout.js";
 import {
@@ -51,6 +54,7 @@ function OrganizationManagament() {
   const [deactivateButton, setDeactivateButton] = useState(true);
   const [modifyButton, setModifyButton] = useState(true);
   const [selectedRowIds, setSelectedRowIds] = useState([]);
+  const [selectedRowIdsPost, setSelectedRowIdsPost] = useState();
   const [isEveryRowIsChecked, setIsEveryRowIsChecked] = useState(false);
   const [rowsIsPartiallyChecked, setRowsIsPartiallyChecked] = useState(false);
   const [loading, setLoading] = useState(true);
@@ -74,26 +78,38 @@ function OrganizationManagament() {
   function deleteDeactivateOrganizationManagament(event) {
     event.preventDefault();
     setLoading(true);
-    postToOpenElisServerFullResponse(
+    postToOpenElisServerJsonResponse(
       `/rest/DeleteOrganization?ID=${selectedRowIds.join(",")}&startingRecNo=1`,
-      searchedOrganizationManagamentListShow || organizationsManagmentListShow, // need to check against the form of restController [mentor]
-      setLoading(false),
-      addNotification({
-        title: intl.formatMessage({
-          id: "notification.title",
-        }),
-        message: intl.formatMessage({
-          id: "notification.login.syntax.error",
-        }),
-        kind: NotificationKinds.error,
-      }),
-      setNotificationVisible(true),
-      setTimeout(() => {
-        window.location.reload();
-      }, 2000),
+      JSON.stringify(selectedRowIdsPost),
+      deleteDeactivateOrganizationManagamentCallback(),
     );
   }
 
+  useEffect(() => {
+    const selectedIDsObject = {
+      selectedIDs: selectedRowIds,
+    };
+
+    setSelectedRowIdsPost(selectedIDsObject);
+  }, [selectedRowIds, organizationsManagmentListShow]);
+
+  function deleteDeactivateOrganizationManagamentCallback() {
+    setLoading(false);
+    setNotificationVisible(true);
+    addNotification({
+      title: intl.formatMessage({
+        id: "notification.title",
+      }),
+      message: intl.formatMessage({
+        id: "notification.organization.post.delete.success",
+      }),
+      kind: NotificationKinds.success,
+    });
+    // setTimeout(() => {
+    //   window.location.reload();
+    // }, 2000);
+  }
+
   const handlePageChange = ({ page, pageSize }) => {
     setPage(page);
     setPageSize(pageSize);
@@ -357,6 +373,7 @@ function OrganizationManagament() {
             <>
               <Grid fullWidth={true} className="gridBoundary">
                 <Column lg={16} md={8} sm={4}>
+                  <br />
                   <DataTable
                     rows={searchedOrganizationManagamentListShow.slice(
                       (page - 1) * pageSize,
@@ -570,6 +587,7 @@ function OrganizationManagament() {
                       )
                     }
                   />
+                  <br />
                 </Column>
               </Grid>
             </>
@@ -811,6 +829,13 @@ function OrganizationManagament() {
         >
           selectedRowIds
         </button>
+        <button
+          onClick={() => {
+            console.error(selectedRowIdsPost);
+          }}
+        >
+          selectedRowIdsPost
+        </button>
       </div>
     </>
   );
diff --git a/frontend/src/languages/en.json b/frontend/src/languages/en.json
index bf9df5cfff..de2b8242f1 100644
--- a/frontend/src/languages/en.json
+++ b/frontend/src/languages/en.json
@@ -1030,6 +1030,7 @@
   "organization.edit.title": "Edit Organization",
   "notification.organization.post.success": "Organization Information Updated Succesfully.",
   "notification.organization.post.save.success": "Organization Information Added Succesfully.",
+  "notification.organization.post.delete.success": "Organization Deactivated Succesfully.",
   "organization.select": "Select",
   "organization.type.CI": "Type of Activity",
   "organization.type.CI.select": "Type of Activity : Select",
diff --git a/frontend/src/languages/fr.json b/frontend/src/languages/fr.json
index 2d24d018e4..163f9f5629 100644
--- a/frontend/src/languages/fr.json
+++ b/frontend/src/languages/fr.json
@@ -940,6 +940,7 @@
   "organization.edit.title": "Modifier l'organisation",
   "notification.organization.post.success": "Informations sur l'organisation mises à jour avec succès.",
   "notification.organization.post.save.success": "Informations sur l'organisation ajoutées avec succès.",
+  "notification.organization.post.delete.success": "Organisation désactivée avec succès.",
   "organization.select": "Sélectionner",
   "organization.type.CI": "Type d'activité",
   "organization.type.CI.select": "Type d'activité : Sélectionner",
diff --git a/src/main/java/org/openelisglobal/organization/controller/rest/OrganizationRestController.java b/src/main/java/org/openelisglobal/organization/controller/rest/OrganizationRestController.java
index 6b8b0b50b7..e9d89eb76f 100644
--- a/src/main/java/org/openelisglobal/organization/controller/rest/OrganizationRestController.java
+++ b/src/main/java/org/openelisglobal/organization/controller/rest/OrganizationRestController.java
@@ -49,7 +49,6 @@
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.SessionAttributes;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.support.SessionStatus;
@@ -58,7 +57,6 @@
 
 @RestController
 @RequestMapping("/rest")
-@SessionAttributes("form")
 public class OrganizationRestController extends BaseController {
 
     private static final String[] ALLOWED_FIELDS = new String[] { "id", "parentOrgName",
@@ -77,10 +75,10 @@ public class OrganizationRestController extends BaseController {
     @Autowired
     private DictionaryService dictionaryService;
 
-    @ModelAttribute("form")
-    public OrganizationForm form() {
-        return new OrganizationForm();
-    }
+    // @ModelAttribute("form")
+    // public OrganizationForm form() {
+    //     return new OrganizationForm();
+    // }
 
     // private static boolean useZip =
     // FormFields.getInstance().useField(FormFields.Field.ZipCode);
@@ -137,9 +135,11 @@ public void initBinder(WebDataBinder binder) {
     }
 
     @GetMapping(value = { "/Organization", "/NextPreviousOrganization" })
-    public ResponseEntity<Object> showOrganization(@ModelAttribute("form") BaseForm oldForm)
+    public ResponseEntity<Object> showOrganization( HttpServletRequest request )
             throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
-        OrganizationForm newForm = resetSessionFormToType(oldForm, OrganizationForm.class);
+
+            OrganizationForm newForm = new OrganizationForm();
+        // OrganizationForm newForm = resetSessionFormToType(oldForm, OrganizationForm.class);
 
         newForm.setCancelAction("CancelOrganization");
 
@@ -175,14 +175,14 @@ public ResponseEntity<Object> showOrganization(@ModelAttribute("form") BaseForm
 
             // return new ModelAndView("redirect:/Organization?ID=" + Encode.forUriComponent(newId) + "&startingRecNo="
             //         + Encode.forUriComponent(start));
-            return ResponseEntity.ok().header("Location", "/Organization?ID=" + Encode.forUriComponent(newId) + "&startingRecNo="
+            return ResponseEntity.status(HttpStatus.FOUND).header("Location", "/Organization?ID=" + Encode.forUriComponent(newId) + "&startingRecNo="
                     + Encode.forUriComponent(start)).build();
         } else if (FWD_PREVIOUS.equals(request.getParameter("direction"))) {
             organization = organizationService.getPrevious(id);
             String newId = organization.getId();
             // return new ModelAndView("redirect:/Organization?ID=" + Encode.forUriComponent(newId) + "&startingRecNo="
             //         + Encode.forUriComponent(start));
-            return ResponseEntity.ok().header("Location", "/Organization?ID=" + Encode.forUriComponent(newId) + "&startingRecNo="
+            return ResponseEntity.status(HttpStatus.FOUND).header("Location", "/Organization?ID=" + Encode.forUriComponent(newId) + "&startingRecNo="
                     + Encode.forUriComponent(start)).build();
         }
 
@@ -289,6 +289,12 @@ private void setCityStateZipList(OrganizationForm form)
         }
     }
 
+    // private void setCityStateZipList(OrganizationForm form)
+    //         throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+    //     List<CityStateZip> cityStateZipList = cityStateZipService.getAll();
+    //     form.setCityStateZipList(cityStateZipList);
+    // }
+
     private List<OrganizationType> getOrganizationTypeList() {
 
         List<OrganizationType> orgTypeList = organizationTypeService.getAll();
@@ -332,6 +338,9 @@ public ResponseEntity<Object> showUpdateOrganization(@RequestBody @Valid Organiz
         } else {
             organization = organizationService.get(form.getId());
             // request.setAttribute("key", "organization.edit.title");
+            if (organization == null) {
+            return ResponseEntity.status(HttpStatus.NOT_FOUND).body("Organization not found.");
+        }
         }
         List<String> selectedOrgTypes = form.getSelectedTypes();
 
@@ -366,23 +375,23 @@ public ResponseEntity<Object> showUpdateOrganization(@RequestBody @Valid Organiz
             LogEvent.logError(e);
             if (e.getCause() instanceof org.hibernate.StaleObjectStateException) {
                 result.reject("errors.OptimisticLockException");
-            } else {
+                return ResponseEntity.status(HttpStatus.CONFLICT).body("Another transaction has updated the organization. Please refresh and try again.");
+            } else if
                 // bugzilla 1482
-                if (e.getCause() instanceof LIMSDuplicateRecordException) {
+                 (e.getCause() instanceof LIMSDuplicateRecordException) {
                     String messageKey = "organization.organization";
                     String msg = MessageUtil.getMessage(messageKey);
-                    result.reject("errors.DuplicateRecord.activeonly", new String[] { msg },
-                            "errors.DuplicateRecord.activeonly");
+                    result.reject("errors.DuplicateRecord.activeonly", new String[] { msg },"errors.DuplicateRecord.activeonly");
+                    return ResponseEntity.status(HttpStatus.CONFLICT).body("Duplicate record error.");
                 } else {
-                    result.reject("errors.UpdateException");
-                }
+                result.reject("errors.UpdateException");
                 return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Failed to save or update organization. Error: " + e.getMessage());
             }
-            saveErrors(result);
+            // saveErrors(result);
             // request.setAttribute(PREVIOUS_DISABLED, "true");
             // request.setAttribute(NEXT_DISABLED, "true");
             // return findForward(FWD_FAIL_INSERT, form);
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Failed to save or update organization. Error: " + e.getMessage());
+            // return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Failed to save or update organization. Error: " + e.getMessage());
             
         }
         // finally {