diff --git a/src/components/Settings/integrations/Organization/OrganizationAccordion.test.tsx b/src/components/Settings/integrations/Organization/OrganizationAccordion.test.tsx
index e776d9fe1..8100b3f96 100644
--- a/src/components/Settings/integrations/Organization/OrganizationAccordion.test.tsx
+++ b/src/components/Settings/integrations/Organization/OrganizationAccordion.test.tsx
@@ -364,7 +364,9 @@ describe('OrganizationAccordion', () => {
 
       await waitFor(() => {
         expect(
-          getByText('Are you sure you wish to disconnect this organization?'),
+          getByText(
+            'Are you sure you wish to disconnect the organization "organizationName"?',
+          ),
         ).toBeInTheDocument();
       });
       userEvent.click(getByText('Yes'));
diff --git a/src/components/Settings/integrations/Organization/OrganizationAccordion.tsx b/src/components/Settings/integrations/Organization/OrganizationAccordion.tsx
index c218734e8..bd5bff654 100644
--- a/src/components/Settings/integrations/Organization/OrganizationAccordion.tsx
+++ b/src/components/Settings/integrations/Organization/OrganizationAccordion.tsx
@@ -24,6 +24,7 @@ import { OrganizationAddAccountModal } from './Modals/OrganizationAddAccountModa
 import { OrganizationEditAccountModal } from './Modals/OrganizationEditAccountModal';
 import { OrganizationImportDataSyncModal } from './Modals/OrganizationImportDataSyncModal';
 import {
+  GetUsersOrganizationsAccountsQuery,
   useDeleteOrganizationAccountMutation,
   useGetUsersOrganizationsAccountsQuery,
   useSyncOrganizationAccountMutation,
@@ -34,6 +35,9 @@ interface OrganizationAccordionProps {
   expandedPanel: string;
 }
 
+type OrganizationAccountPartial =
+  GetUsersOrganizationsAccountsQuery['userOrganizationAccounts'][0];
+
 const OrganizationDeleteIconButton = styled(IconButton)(() => ({
   color: theme.palette.cruGrayMedium.main,
   marginLeft: '10px',
@@ -87,16 +91,18 @@ export const OrganizationAccordion: React.FC<OrganizationAccordionProps> = ({
   const accountListId = useAccountListId();
   const { enqueueSnackbar } = useSnackbar();
   const { appName } = useGetAppSettings();
-  const [showAddAccountModal, setShowAddAccountModal] = useState(false);
-  const [showImportDataSyncModal, setShowImportDataSyncModal] = useState(false);
-  const [showDeleteOrganizationModal, setShowDeleteOrganizationModal] =
-    useState(false);
-  const [showEditOrganizationModal, setShowEditOrganizationModal] =
-    useState(false);
   const [deleteOrganizationAccount] = useDeleteOrganizationAccountMutation();
   const [syncOrganizationAccount] = useSyncOrganizationAccountMutation();
   const { getOrganizationOauthUrl: getOauthUrl } = useOauthUrl();
 
+  const [showAddAccountModal, setShowAddAccountModal] = useState(false);
+  const [importDataSyncModal, setImportDataSyncModal] =
+    useState<OrganizationAccountPartial | null>(null);
+  const [deleteOrganizationModal, setDeleteOrganizationModal] =
+    useState<OrganizationAccountPartial | null>(null);
+  const [editOrganizationModal, setEditOrganizationModal] =
+    useState<OrganizationAccountPartial | null>(null);
+
   const {
     data,
     loading,
@@ -204,138 +210,121 @@ export const OrganizationAccordion: React.FC<OrganizationAccordionProps> = ({
 
       {!loading && !!organizations?.length && (
         <Box style={{ marginTop: '20px' }}>
-          {organizations.map(
-            ({ organization, lastDownloadedAt, latestDonationDate, id }) => {
-              const type = getOrganizationType(
-                organization.apiClass,
-                organization.oauth,
-              );
+          {organizations.map((organizationAccount) => {
+            const { organization, lastDownloadedAt, latestDonationDate, id } =
+              organizationAccount;
+            const type = getOrganizationType(
+              organization.apiClass,
+              organization.oauth,
+            );
 
-              return (
-                <Card key={organization.id} style={{ marginBottom: '20px' }}>
+            return (
+              <Card key={organization.id} style={{ marginBottom: '20px' }}>
+                <Box
+                  sx={{
+                    p: 1,
+                    pl: 2,
+                    background: theme.palette.cruGrayLight.main,
+                    justifyContent: 'space-between',
+                    display: 'flex',
+                  }}
+                >
                   <Box
                     sx={{
-                      p: 1,
-                      pl: 2,
-                      background: theme.palette.cruGrayLight.main,
-                      justifyContent: 'space-between',
                       display: 'flex',
+                      alignItems: 'center',
                     }}
                   >
-                    <Box
-                      sx={{
-                        display: 'flex',
-                        alignItems: 'center',
-                      }}
-                    >
-                      <Typography fontWeight={700}>
-                        {organization.name}
-                      </Typography>
-                    </Box>
-                    <Box
-                      sx={{
-                        display: 'flex',
-                        alignItems: 'center',
-                      }}
-                    >
-                      {type !== OrganizationTypesEnum.OFFLINE && (
-                        <StyledServicesButton
-                          variant="contained"
-                          size="small"
-                          sx={{ m: '0 0 0 10px' }}
-                          onClick={() => handleSync(id)}
-                        >
-                          {t('Sync')}
-                        </StyledServicesButton>
-                      )}
+                    <Typography fontWeight={700}>
+                      {organization.name}
+                    </Typography>
+                  </Box>
+                  <Box
+                    sx={{
+                      display: 'flex',
+                      alignItems: 'center',
+                    }}
+                  >
+                    {type !== OrganizationTypesEnum.OFFLINE && (
+                      <StyledServicesButton
+                        variant="contained"
+                        size="small"
+                        sx={{ m: '0 0 0 10px' }}
+                        onClick={() => handleSync(id)}
+                      >
+                        {t('Sync')}
+                      </StyledServicesButton>
+                    )}
 
-                      {type === OrganizationTypesEnum.OFFLINE && (
-                        <StyledServicesButton
-                          variant="contained"
-                          size="small"
-                          sx={{ m: '0 0 0 10px' }}
-                          onClick={() => setShowImportDataSyncModal(true)}
-                        >
-                          {t('Import TntConnect DataSync file')}
-                        </StyledServicesButton>
-                      )}
+                    {type === OrganizationTypesEnum.OFFLINE && (
+                      <StyledServicesButton
+                        variant="contained"
+                        size="small"
+                        sx={{ m: '0 0 0 10px' }}
+                        onClick={() =>
+                          setImportDataSyncModal(organizationAccount)
+                        }
+                      >
+                        {t('Import TntConnect DataSync file')}
+                      </StyledServicesButton>
+                    )}
 
-                      {type === OrganizationTypesEnum.OAUTH && (
-                        <StyledServicesButton
-                          variant="contained"
-                          size="small"
-                          sx={{ m: '0 0 0 10px' }}
-                          onClick={() => handleReconnect(organization.id)}
-                        >
-                          {t('Reconnect')}
-                        </StyledServicesButton>
-                      )}
-                      {type === OrganizationTypesEnum.LOGIN && (
-                        <OrganizationDeleteIconButton
-                          onClick={() => setShowEditOrganizationModal(true)}
-                        >
-                          <Edit />
-                        </OrganizationDeleteIconButton>
-                      )}
+                    {type === OrganizationTypesEnum.OAUTH && (
+                      <StyledServicesButton
+                        variant="contained"
+                        size="small"
+                        sx={{ m: '0 0 0 10px' }}
+                        onClick={() => handleReconnect(organization.id)}
+                      >
+                        {t('Reconnect')}
+                      </StyledServicesButton>
+                    )}
+                    {type === OrganizationTypesEnum.LOGIN && (
                       <OrganizationDeleteIconButton
-                        onClick={() => setShowDeleteOrganizationModal(true)}
+                        onClick={() =>
+                          setEditOrganizationModal(organizationAccount)
+                        }
                       >
-                        <DeleteIcon />
+                        <Edit />
                       </OrganizationDeleteIconButton>
-                    </Box>
+                    )}
+                    <OrganizationDeleteIconButton
+                      onClick={() =>
+                        setDeleteOrganizationModal(organizationAccount)
+                      }
+                    >
+                      <DeleteIcon />
+                    </OrganizationDeleteIconButton>
                   </Box>
-                  <Divider />
-                  {lastDownloadedAt && (
-                    <Box sx={{ p: 2, display: 'flex' }}>
-                      <Grid container spacing={2}>
-                        <Grid item xs={6}>
-                          {t('Last Updated')}
-                        </Grid>
-                        <Grid item xs={6}>
-                          {DateTime.fromISO(lastDownloadedAt).toRelative()}
-                        </Grid>
+                </Box>
+                <Divider />
+                {lastDownloadedAt && (
+                  <Box sx={{ p: 2, display: 'flex' }}>
+                    <Grid container spacing={2}>
+                      <Grid item xs={6}>
+                        {t('Last Updated')}
                       </Grid>
-                    </Box>
-                  )}
-                  {latestDonationDate && (
-                    <Box sx={{ p: 2, display: 'flex' }}>
-                      <Grid container spacing={2}>
-                        <Grid item xs={6}>
-                          {t('Last Gift Date')}
-                        </Grid>
-                        <Grid item xs={6}>
-                          {DateTime.fromISO(latestDonationDate).toRelative()}
-                        </Grid>
+                      <Grid item xs={6}>
+                        {DateTime.fromISO(lastDownloadedAt).toRelative()}
                       </Grid>
-                    </Box>
-                  )}
-                  <Confirmation
-                    isOpen={showDeleteOrganizationModal}
-                    title={t('Confirm')}
-                    message={t(
-                      'Are you sure you wish to disconnect this organization?',
-                    )}
-                    handleClose={() => setShowDeleteOrganizationModal(false)}
-                    mutation={() => handleDelete(id)}
-                  />
-                  {showEditOrganizationModal && (
-                    <OrganizationEditAccountModal
-                      handleClose={() => setShowEditOrganizationModal(false)}
-                      organizationId={id}
-                    />
-                  )}
-                  {showImportDataSyncModal && (
-                    <OrganizationImportDataSyncModal
-                      handleClose={() => setShowImportDataSyncModal(false)}
-                      organizationId={id}
-                      organizationName={organization.name}
-                      accountListId={accountListId ?? ''}
-                    />
-                  )}
-                </Card>
-              );
-            },
-          )}
+                    </Grid>
+                  </Box>
+                )}
+                {latestDonationDate && (
+                  <Box sx={{ p: 2, display: 'flex' }}>
+                    <Grid container spacing={2}>
+                      <Grid item xs={6}>
+                        {t('Last Gift Date')}
+                      </Grid>
+                      <Grid item xs={6}>
+                        {DateTime.fromISO(latestDonationDate).toRelative()}
+                      </Grid>
+                    </Grid>
+                  </Box>
+                )}
+              </Card>
+            );
+          })}
         </Box>
       )}
 
@@ -353,6 +342,34 @@ export const OrganizationAccordion: React.FC<OrganizationAccordionProps> = ({
           refetchOrganizations={refetchOrganizations}
         />
       )}
+
+      {importDataSyncModal && (
+        <OrganizationImportDataSyncModal
+          handleClose={() => setImportDataSyncModal(null)}
+          organizationId={importDataSyncModal.id}
+          organizationName={importDataSyncModal.organization.name}
+          accountListId={accountListId ?? ''}
+        />
+      )}
+
+      {editOrganizationModal && (
+        <OrganizationEditAccountModal
+          handleClose={() => setEditOrganizationModal(null)}
+          organizationId={editOrganizationModal.id}
+        />
+      )}
+
+      {deleteOrganizationModal && (
+        <Confirmation
+          isOpen={true}
+          title={t('Confirm')}
+          message={t(
+            `Are you sure you wish to disconnect the organization "${deleteOrganizationModal.organization.name}"?`,
+          )}
+          handleClose={() => setDeleteOrganizationModal(null)}
+          mutation={() => handleDelete(deleteOrganizationModal.id)}
+        />
+      )}
     </AccordionItem>
   );
 };