diff --git a/src/components/Contacts/ContactDetails/ContactDetailsTab/Mailing/EditContactAddressModal/EditContactAddressModal.tsx b/src/components/Contacts/ContactDetails/ContactDetailsTab/Mailing/EditContactAddressModal/EditContactAddressModal.tsx
index 713f77eea..9b6af14a0 100644
--- a/src/components/Contacts/ContactDetails/ContactDetailsTab/Mailing/EditContactAddressModal/EditContactAddressModal.tsx
+++ b/src/components/Contacts/ContactDetails/ContactDetailsTab/Mailing/EditContactAddressModal/EditContactAddressModal.tsx
@@ -68,7 +68,7 @@ interface EditContactAddressModalProps {
   accountListId: string;
   address: ContactMailingFragment['addresses']['nodes'][0];
   contactId: string;
-  handleClose: () => void;
+  handleClose: (deletedAddress: boolean) => void;
 }
 
 export const EditContactAddressModal: React.FC<
@@ -115,7 +115,7 @@ export const EditContactAddressModal: React.FC<
     enqueueSnackbar(t('Address updated successfully'), {
       variant: 'success',
     });
-    handleClose();
+    handleClose(false);
   };
 
   const deleteContactAddress = async (): Promise<void> => {
@@ -158,10 +158,11 @@ export const EditContactAddressModal: React.FC<
         },
       });
     }
-    handleClose();
+    handleClose(true);
   };
 
-  const editingDisabled = address.source === 'Siebel';
+  const editingDisabled =
+    address.source === 'Siebel' || address.source === 'DataServer';
   const { data: emailData } = useDonationServicesEmailQuery({
     variables: {
       accountListId,
@@ -171,7 +172,11 @@ export const EditContactAddressModal: React.FC<
   });
 
   return (
-    <Modal isOpen={true} title={t('Edit Address')} handleClose={handleClose}>
+    <Modal
+      isOpen={true}
+      title={t('Edit Address')}
+      handleClose={() => handleClose(false)}
+    >
       <Formik
         initialValues={{
           id: address.id,
@@ -213,29 +218,43 @@ export const EditContactAddressModal: React.FC<
               <ContactEditContainer>
                 {editingDisabled && (
                   <ContactInputWrapper>
-                    <Alert severity="info">
-                      <AlertTitle sx={{ fontWeight: 'bold' }}>
-                        {t('This address is provided by Donation Services')}
-                      </AlertTitle>
-                      <p>
-                        {t(
-                          'The address that syncs with Donation Services cannot be edited here. Please email Donation Services with the updated address, or you can create a new address and select it as your primary mailing address.',
+                    {address.source === 'Siebel' && (
+                      <Alert severity="info">
+                        <AlertTitle sx={{ fontWeight: 'bold' }}>
+                          {t('This address is provided by Donation Services')}
+                        </AlertTitle>
+                        <p>
+                          {t(
+                            'The address that syncs with Donation Services cannot be edited here. Please email Donation Services with the updated address, or you can create a new address and select it as your primary mailing address.',
+                          )}
+                        </p>
+                        {emailData && (
+                          <p>
+                            <Link
+                              href={`mailto:donation.services@cru.org?subject=Donor+address+change&body=${encodeURIComponent(
+                                generateEmailBody(emailData, address),
+                              )}`}
+                              underline="hover"
+                              sx={{ fontWeight: 'bold' }}
+                            >
+                              {t('Email Donation Services here')}
+                            </Link>
+                          </p>
                         )}
-                      </p>
-                      {emailData && (
+                      </Alert>
+                    )}
+                    {address.source === 'DataServer' && (
+                      <Alert severity="info">
+                        <AlertTitle sx={{ fontWeight: 'bold' }}>
+                          {t('This address is provided by your organization.')}
+                        </AlertTitle>
                         <p>
-                          <Link
-                            href={`mailto:donation.services@cru.org?subject=Donor+address+change&body=${encodeURIComponent(
-                              generateEmailBody(emailData, address),
-                            )}`}
-                            underline="hover"
-                            sx={{ fontWeight: 'bold' }}
-                          >
-                            {t('Email Donation Services here')}
-                          </Link>
+                          {t(
+                            'The address that syncs with your organization’s donations cannot be edited here. Please email your donation department with the updated address, or you can create a new address and select it as your primary mailing address.',
+                          )}
                         </p>
-                      )}
-                    </Alert>
+                      </Alert>
+                    )}
                   </ContactInputWrapper>
                 )}
                 <ContactInputWrapper>
@@ -391,8 +410,13 @@ export const EditContactAddressModal: React.FC<
               </ContactEditContainer>
             </DialogContent>
             <DialogActions>
-              {address && <DeleteButton onClick={deleteContactAddress} />}
-              <CancelButton onClick={handleClose} disabled={isSubmitting} />
+              {address && !editingDisabled && (
+                <DeleteButton onClick={deleteContactAddress} />
+              )}
+              <CancelButton
+                onClick={() => handleClose(false)}
+                disabled={isSubmitting}
+              />
               <SubmitButton disabled={!isValid || isSubmitting}>
                 {(updating || deleting || settingPrimaryAddress) && (
                   <LoadingIndicator color="primary" size={20} />
diff --git a/src/components/Tool/FixMailingAddresses/AddressModal.tsx b/src/components/Tool/FixMailingAddresses/AddressModal.tsx
deleted file mode 100644
index c62e7963b..000000000
--- a/src/components/Tool/FixMailingAddresses/AddressModal.tsx
+++ /dev/null
@@ -1,369 +0,0 @@
-import React from 'react';
-import { mdiCloseThick, mdiInformation, mdiMap } from '@mdi/js';
-import Icon from '@mdi/react';
-import {
-  Box,
-  Card,
-  CardActions,
-  CardContent,
-  CardHeader,
-  Checkbox,
-  Grid,
-  IconButton,
-  Modal,
-  NativeSelect,
-  TextField,
-  Typography,
-} from '@mui/material';
-import clsx from 'clsx';
-import { useTranslation } from 'react-i18next';
-import { makeStyles } from 'tss-react/mui';
-import {
-  CancelButton,
-  SubmitButton,
-} from 'src/components/common/Modal/ActionButtons/ActionButtons';
-import theme from '../../../theme';
-import { StyledInput } from '../StyledInput';
-import { ContactAddressFragment } from './GetInvalidAddresses.generated';
-
-const useStyles = makeStyles()(() => ({
-  modal: {
-    display: 'flex',
-    alignItems: 'center',
-    justifyContent: 'center',
-    overflow: 'auto',
-  },
-  paddingX: {
-    paddingLeft: theme.spacing(1),
-    paddingRight: theme.spacing(1),
-  },
-  paddingY: {
-    paddingBottom: theme.spacing(2),
-  },
-  blue: {
-    color: 'white',
-    backgroundColor: theme.palette.mpdxBlue.main,
-  },
-  iconButton: {
-    position: 'absolute',
-    top: -theme.spacing(2),
-    right: -theme.spacing(2),
-  },
-  headerBox: {
-    padding: 0,
-    position: 'relative',
-  },
-  mapBox: {
-    marginTop: theme.spacing(1),
-    height: 200,
-    width: '100%',
-    backgroundColor: theme.palette.cruGrayDark.main,
-  },
-  widthFull: {
-    width: '100%',
-  },
-  cardContent: {
-    paddingLeft: theme.spacing(1),
-    paddingRight: theme.spacing(1),
-    paddingTop: 0,
-    paddingBottom: 0,
-    border: 'none',
-    outline: 'none',
-  },
-  infoBox: {
-    border: `1px solid ${theme.palette.mpdxBlue.main}`,
-    backgroundColor: theme.palette.cruGrayLight.main,
-    color: theme.palette.mpdxBlue.main,
-    marginLeft: theme.spacing(1),
-    marginRight: theme.spacing(1),
-    marginBottom: theme.spacing(2),
-    padding: theme.spacing(2),
-  },
-  infoMain: {
-    display: 'flex',
-    fontWeight: 600,
-    marginBottom: theme.spacing(1),
-  },
-}));
-
-interface Props {
-  modalState: {
-    open: boolean;
-    address: ContactAddressFragment;
-  };
-  handleClose: () => void;
-  handleChange: (
-    event:
-      | React.ChangeEvent<HTMLInputElement & HTMLSelectElement>
-      | React.ChangeEvent<HTMLInputElement>,
-    props: string,
-  ) => void;
-}
-
-const AddressModal: React.FC<Props> = ({
-  modalState,
-  handleClose,
-  handleChange,
-}) => {
-  const { classes } = useStyles();
-  const { t } = useTranslation();
-
-  const disableAll = !modalState.address.source.includes('MPDX');
-
-  return (
-    <Modal
-      open={modalState.open}
-      onClose={handleClose}
-      className={classes.modal}
-    >
-      <Grid item xs={10} md={6} lg={4}>
-        <Box>
-          <Card>
-            <CardHeader
-              style={{ border: 'none' }}
-              title={
-                <Box
-                  display="flex"
-                  flexDirection="column"
-                  alignItems="center"
-                  className={classes.headerBox}
-                >
-                  <Typography
-                    variant="h5"
-                    style={{ marginTop: -theme.spacing(1) }}
-                  >
-                    {modalState.address.id === 'new'
-                      ? 'Add Address'
-                      : 'Edit Address'}
-                  </Typography>
-                  <IconButton
-                    onClick={handleClose}
-                    className={classes.iconButton}
-                  >
-                    <Icon path={mdiCloseThick} size={1} />
-                  </IconButton>
-                  <Box
-                    display="flex"
-                    justifyContent="center"
-                    alignItems="center"
-                    className={classes.mapBox}
-                  >
-                    <Icon path={mdiMap} size={4} style={{ color: 'white' }} />
-                  </Box>
-                </Box>
-              }
-            />
-            <CardContent className={classes.cardContent}>
-              {disableAll && (
-                <Box className={classes.infoBox}>
-                  <Typography className={classes.infoMain}>
-                    <Icon
-                      path={mdiInformation}
-                      size={1}
-                      style={{ marginRight: theme.spacing(1) }}
-                    />
-                    This address is provided by your organization.
-                  </Typography>
-                  <Typography>
-                    The address that syncs with your organization’s donations
-                    cannot be edited here. Please email your donation department
-                    with the updated address, or you can create a new address
-                    and select it as your primary mailing address.
-                  </Typography>
-                </Box>
-              )}
-              <Grid container>
-                <Grid
-                  item
-                  xs={12}
-                  sm={9}
-                  className={clsx(classes.paddingX, classes.paddingY)}
-                >
-                  <TextField
-                    label="Street"
-                    variant="outlined"
-                    value={modalState.address?.street}
-                    size="small"
-                    className={classes.widthFull}
-                    onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
-                      handleChange(event, 'street')
-                    }
-                    disabled={disableAll}
-                  />
-                </Grid>
-                <Grid
-                  item
-                  xs={6}
-                  sm={3}
-                  className={clsx(classes.paddingX, classes.paddingY)}
-                >
-                  <NativeSelect
-                    value={modalState.address?.location || ''}
-                    input={<StyledInput />}
-                    disabled={disableAll}
-                    onChange={(
-                      event: React.ChangeEvent<
-                        HTMLSelectElement & HTMLInputElement
-                      >,
-                    ) => handleChange(event, 'location')}
-                    className={classes.widthFull}
-                  >
-                    <option value="" disabled>
-                      Type
-                    </option>
-                    <option value="home">{t('Home')}</option>
-                    <option value="business">{t('Business')}</option>
-                    <option value="mailing">{t('Mailing')}</option>
-                    <option value="seasonal">{t('Seasonal')}</option>
-                    <option value="other">{t('Other')}</option>
-                    <option value="temporary">{t('Temporary')}</option>
-                    <option value="repAddress">{t('Rep Address')}</option>
-                  </NativeSelect>
-                </Grid>
-                <Grid
-                  item
-                  xs={6}
-                  sm={6}
-                  className={clsx(classes.paddingX, classes.paddingY)}
-                >
-                  <TextField
-                    label="City"
-                    disabled={disableAll}
-                    variant="outlined"
-                    value={modalState.address?.city}
-                    size="small"
-                    className={classes.widthFull}
-                    onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
-                      handleChange(event, 'city')
-                    }
-                  />
-                </Grid>
-                <Grid
-                  item
-                  xs={6}
-                  sm={3}
-                  className={clsx(classes.paddingX, classes.paddingY)}
-                >
-                  <TextField
-                    label="State"
-                    disabled={disableAll}
-                    variant="outlined"
-                    value={modalState.address?.state || ''}
-                    size="small"
-                    className={classes.widthFull}
-                    onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
-                      handleChange(event, 'state')
-                    }
-                  />
-                </Grid>
-                <Grid
-                  item
-                  xs={6}
-                  sm={3}
-                  className={clsx(classes.paddingX, classes.paddingY)}
-                >
-                  <TextField
-                    label="Zip"
-                    disabled={disableAll}
-                    variant="outlined"
-                    value={modalState.address?.postalCode || ''}
-                    size="small"
-                    className={classes.widthFull}
-                    onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
-                      handleChange(event, 'postalCode')
-                    }
-                  />
-                </Grid>
-                <Grid
-                  item
-                  xs={12}
-                  sm={6}
-                  className={clsx(classes.paddingX, classes.paddingY)}
-                >
-                  <TextField
-                    label="Country"
-                    disabled={disableAll}
-                    variant="outlined"
-                    value={modalState.address?.country}
-                    size="small"
-                    className={classes.widthFull}
-                    onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
-                      handleChange(event, 'country')
-                    }
-                  />
-                </Grid>
-                <Grid
-                  item
-                  xs={6}
-                  sm={3}
-                  className={clsx(classes.paddingX, classes.paddingY)}
-                >
-                  <TextField
-                    label="Region"
-                    disabled={disableAll}
-                    variant="outlined"
-                    value={modalState.address?.region || ''}
-                    size="small"
-                    className={classes.widthFull}
-                    onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
-                      handleChange(event, 'region')
-                    }
-                  />
-                </Grid>
-                <Grid
-                  item
-                  xs={6}
-                  sm={3}
-                  className={clsx(classes.paddingX, classes.paddingY)}
-                >
-                  <TextField
-                    label="Metro"
-                    variant="outlined"
-                    disabled={disableAll}
-                    value={modalState.address?.metroArea || ''}
-                    size="small"
-                    className={classes.widthFull}
-                    onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
-                      handleChange(event, 'metroArea')
-                    }
-                  />
-                </Grid>
-                <Grid item xs={12} className={clsx(classes.paddingX)}>
-                  <Box
-                    display="flex"
-                    alignItems="center"
-                    style={{ marginTop: -theme.spacing(1) }}
-                  >
-                    <Checkbox
-                      checked={
-                        modalState.address
-                          ? modalState.address?.historic
-                          : false
-                      }
-                      name="checkbox"
-                      onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
-                        handleChange(event, 'historic')
-                      }
-                    />
-                    <Typography style={{ marginLeft: theme.spacing(1) }}>
-                      Address no longer valid
-                    </Typography>
-                  </Box>
-                </Grid>
-              </Grid>
-            </CardContent>
-            <CardActions style={{ padding: theme.spacing(2) }}>
-              <CancelButton onClick={handleClose} />
-              <SubmitButton type="button" disabled={disableAll}>
-                {/*TODO: make "newAddress" field in address false so it says "edit" instead of "add" */}
-                Save
-              </SubmitButton>
-            </CardActions>
-          </Card>
-        </Box>
-      </Grid>
-    </Modal>
-  );
-};
-
-export default AddressModal;
diff --git a/src/components/Tool/FixMailingAddresses/Contact.tsx b/src/components/Tool/FixMailingAddresses/Contact.tsx
index fcfe665b6..8a0bd1eda 100644
--- a/src/components/Tool/FixMailingAddresses/Contact.tsx
+++ b/src/components/Tool/FixMailingAddresses/Contact.tsx
@@ -89,18 +89,21 @@ const useStyles = makeStyles()(() => ({
 }));
 
 interface Props {
-  id?: string;
+  id: string;
   name: string;
   status: string;
   addresses: ContactAddressFragment[];
-  openFunction: (address: ContactAddressFragment) => void;
+  openEditAddressModal: (address: ContactAddressFragment, id: string) => void;
+  openNewAddressModal: (address: ContactAddressFragment, id: string) => void;
 }
 
 const Contact: React.FC<Props> = ({
+  id,
   name,
   status,
   addresses,
-  openFunction,
+  openEditAddressModal,
+  openNewAddressModal,
 }) => {
   const { t } = useTranslation();
   const locale = useLocale();
@@ -194,7 +197,7 @@ const Contact: React.FC<Props> = ({
                       classes.paddingL2,
                       classes.hoverHighlight,
                     )}
-                    onClick={() => openFunction(address)}
+                    onClick={() => openEditAddressModal(address, id)}
                   >
                     <Box className={classes.address}>
                       <Typography>
@@ -238,7 +241,7 @@ const Contact: React.FC<Props> = ({
                 )}
               >
                 <Box
-                  onClick={() => openFunction(newAddress)}
+                  onClick={() => openNewAddressModal(newAddress, id)}
                   className={classes.address}
                 />
                 <Icon path={mdiPlus} size={1} />
diff --git a/src/components/Tool/FixMailingAddresses/FixMailingAddresses.tsx b/src/components/Tool/FixMailingAddresses/FixMailingAddresses.tsx
index 03eaf814d..841b655b2 100644
--- a/src/components/Tool/FixMailingAddresses/FixMailingAddresses.tsx
+++ b/src/components/Tool/FixMailingAddresses/FixMailingAddresses.tsx
@@ -14,9 +14,9 @@ import {
 } from '@mui/material';
 import { Trans, useTranslation } from 'react-i18next';
 import { makeStyles } from 'tss-react/mui';
+import { EditContactAddressModal } from 'src/components/Contacts/ContactDetails/ContactDetailsTab/Mailing/EditContactAddressModal/EditContactAddressModal';
 import theme from '../../../theme';
 import NoData from '../NoData';
-import AddressModal from './AddressModal';
 import Contact from './Contact';
 import {
   ContactAddressFragment,
@@ -50,7 +50,6 @@ const useStyles = makeStyles()(() => ({
     display: 'flex',
     justifyContent: 'center',
   },
-
   confirmAllButton: {
     [theme.breakpoints.down('md')]: {
       width: '100%',
@@ -58,7 +57,6 @@ const useStyles = makeStyles()(() => ({
       margin: `${theme.spacing(1)} auto 0`,
     },
   },
-
   buttonIcon: {
     marginRight: theme.spacing(1),
   },
@@ -114,38 +112,26 @@ const FixSendNewsletter: React.FC<Props> = ({ accountListId }: Props) => {
   const [modalState, setModalState] = useState({
     open: false,
     address: emptyAddress,
+    contactId: '',
   });
   const { t } = useTranslation();
   const [defaultSource, setDefaultSource] = useState('MPDX');
-  const { data, loading } = useInvalidAddressesQuery({
+  const { data, loading, refetch } = useInvalidAddressesQuery({
     variables: { accountListId },
   });
 
-  const handleOpen = (address: ContactAddressFragment): void => {
-    setModalState({ open: true, address: address });
-  };
-
-  const handleClose = (): void => {
-    setModalState({ open: false, address: emptyAddress });
+  const handleOpen = (
+    address: ContactAddressFragment,
+    contactId: string,
+  ): void => {
+    setModalState({ open: true, address, contactId });
   };
 
-  const handleChange = (
-    event:
-      | React.ChangeEvent<HTMLInputElement & HTMLSelectElement>
-      | React.ChangeEvent<HTMLInputElement>,
-    props: string,
-  ): void => {
-    const tempAddress = modalState.address; // Error prevention, can remove later
-    setModalState((prevState) => ({
-      ...prevState,
-      address: {
-        ...tempAddress,
-        [props]:
-          event.target.name === 'checkbox'
-            ? event.target.checked
-            : event.target.value,
-      },
-    }));
+  const handleClose = (deleteAddress: boolean): void => {
+    if (deleteAddress) {
+      refetch();
+    }
+    setModalState({ open: false, address: emptyAddress, contactId: '' });
   };
 
   const handleSourceChange = (event: SelectChangeEvent<string>): void => {
@@ -229,7 +215,8 @@ const FixSendNewsletter: React.FC<Props> = ({ accountListId }: Props) => {
                       status={contact.status || ''}
                       key={contact.id}
                       addresses={contact.addresses.nodes}
-                      openFunction={handleOpen}
+                      openEditAddressModal={handleOpen}
+                      openNewAddressModal={handleOpen}
                     />
                   ))}
                 </Grid>
@@ -250,11 +237,14 @@ const FixSendNewsletter: React.FC<Props> = ({ accountListId }: Props) => {
           </React.Fragment>
         )}
       </Grid>
-      <AddressModal
-        modalState={modalState}
-        handleClose={handleClose}
-        handleChange={handleChange}
-      />
+      {modalState.open && (
+        <EditContactAddressModal
+          accountListId={accountListId}
+          address={modalState.address}
+          contactId={modalState.contactId}
+          handleClose={handleClose}
+        />
+      )}
     </Box>
   );
 };