diff --git a/client/src/components/chat-open-button/chat-open-button.component.jsx b/client/src/components/chat-open-button/chat-open-button.component.jsx
index 76db997cd..4874f43fd 100644
--- a/client/src/components/chat-open-button/chat-open-button.component.jsx
+++ b/client/src/components/chat-open-button/chat-open-button.component.jsx
@@ -19,30 +19,35 @@ const mapDispatchToProps = (dispatch) => ({
   openChatByPhone: (phone) => dispatch(openChatByPhone(phone))
 });
 
-export function ChatOpenButton({ bodyshop, searchingForConversation, phone, jobid, openChatByPhone }) {
+export function ChatOpenButton({ bodyshop, searchingForConversation, phone, type, jobid, openChatByPhone }) {
   const { t } = useTranslation();
   const { socket } = useSocket();
   const notification = useNotification();
 
   if (!phone) return <></>;
 
-  if (!bodyshop.messagingservicesid) return <PhoneNumberFormatter>{phone}</PhoneNumberFormatter>;
+  if (!bodyshop.messagingservicesid) {
+    return <PhoneNumberFormatter type={type}>{phone}</PhoneNumberFormatter>;
+  }
 
   return (
     <a
       href="# "
       onClick={(e) => {
+        e.preventDefault();
         e.stopPropagation();
+
+        if (searchingForConversation) return; // Prevent finding the same thing twice.
+
         const p = parsePhoneNumber(phone, "CA");
-        if (searchingForConversation) return; //This is to prevent finding the same thing twice.
         if (p && p.isValid()) {
-          openChatByPhone({ phone_num: p.formatInternational(), jobid: jobid, socket });
+          openChatByPhone({ phone_num: p.formatInternational(), jobid, socket });
         } else {
           notification["error"]({ message: t("messaging.error.invalidphone") });
         }
       }}
     >
-      <PhoneNumberFormatter>{phone}</PhoneNumberFormatter>
+      <PhoneNumberFormatter type={type}>{phone}</PhoneNumberFormatter>
     </a>
   );
 }
diff --git a/client/src/components/contract-convert-to-ro/contract-convert-to-ro.component.jsx b/client/src/components/contract-convert-to-ro/contract-convert-to-ro.component.jsx
index d53c2c151..f4ecd3636 100644
--- a/client/src/components/contract-convert-to-ro/contract-convert-to-ro.component.jsx
+++ b/client/src/components/contract-convert-to-ro/contract-convert-to-ro.component.jsx
@@ -133,6 +133,9 @@ export function ContractConvertToRo({ bodyshop, currentUser, contract, disabled
       ownr_ln: contract.job.owner.ownr_ln,
       ownr_co_nm: contract.job.owner.ownr_co_nm,
       ownr_ph1: contract.job.owner.ownr_ph1,
+      ownr_ph2: contract.job.owner.ownr_ph2,
+      ownr_ph1_ty: contract.job.owner.ownr_ph1_ty,
+      ownr_ph2_ty: contract.job.owner.ownr_ph2_ty,
       ownr_ea: contract.job.owner.ownr_ea,
       v_model_desc: contract.job.vehicle && contract.job.vehicle.v_model_desc,
       v_model_yr: contract.job.vehicle && contract.job.vehicle.v_model_yr,
diff --git a/client/src/components/dashboard-components/scheduled-delivery-today/scheduled-delivery-today.component.jsx b/client/src/components/dashboard-components/scheduled-delivery-today/scheduled-delivery-today.component.jsx
index 12c2f6569..80c10a884 100644
--- a/client/src/components/dashboard-components/scheduled-delivery-today/scheduled-delivery-today.component.jsx
+++ b/client/src/components/dashboard-components/scheduled-delivery-today/scheduled-delivery-today.component.jsx
@@ -256,9 +256,9 @@ export default function DashboardScheduledDeliveryToday({ data, ...cardProps })
       responsive: ["md"],
       render: (text, record) => (
         <Space size="small" wrap>
-          <ChatOpenButton phone={record.ownr_ph1} jobid={record.jobid} />
+          <ChatOpenButton type={record.ownr_ph1_ty} phone={record.ownr_ph1} jobid={record.jobid} />
 
-          <ChatOpenButton phone={record.ownr_ph2} jobid={record.jobid} />
+          <ChatOpenButton type={record.ownr_ph2_ty} phone={record.ownr_ph2} jobid={record.jobid} />
         </Space>
       )
     },
@@ -397,6 +397,8 @@ export const DashboardScheduledDeliveryTodayGql = `
       ownr_ln
       ownr_ph1
       ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
       production_vars
       ro_number
       scheduled_delivery
diff --git a/client/src/components/dashboard-components/scheduled-in-today/scheduled-in-today.component.jsx b/client/src/components/dashboard-components/scheduled-in-today/scheduled-in-today.component.jsx
index 05d76983e..a4936e78f 100644
--- a/client/src/components/dashboard-components/scheduled-in-today/scheduled-in-today.component.jsx
+++ b/client/src/components/dashboard-components/scheduled-in-today/scheduled-in-today.component.jsx
@@ -48,6 +48,8 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {
         ownr_ln: item.job.ownr_ln,
         ownr_ph1: item.job.ownr_ph1,
         ownr_ph2: item.job.ownr_ph2,
+        ownr_ph1_ty: item.job.ownr_ph1_ty,
+        ownr_ph2_ty: item.job.ownr_ph2_ty,
         production_vars: item.job.production_vars,
         ro_number: item.job.ro_number,
         suspended: item.job.suspended,
@@ -264,8 +266,8 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {
       responsive: ["md"],
       render: (text, record) => (
         <Space size="small" wrap>
-          <ChatOpenButton phone={record.ownr_ph1} jobid={record.jobid} />
-          <ChatOpenButton phone={record.ownr_ph2} jobid={record.jobid} />
+          <ChatOpenButton type={record.ownr_ph1_ty} phone={record.ownr_ph1} jobid={record.jobid} />
+          <ChatOpenButton type={record.ownr_ph2_ty} phone={record.ownr_ph2} jobid={record.jobid} />
         </Space>
       )
     },
@@ -400,6 +402,8 @@ export const DashboardScheduledInTodayGql = `
       ownr_ln
       ownr_ph1
       ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
       production_vars
       ro_number
       suspended
diff --git a/client/src/components/dashboard-components/scheduled-out-today/scheduled-out-today.component.jsx b/client/src/components/dashboard-components/scheduled-out-today/scheduled-out-today.component.jsx
index fdfcc53a5..05dac46a9 100644
--- a/client/src/components/dashboard-components/scheduled-out-today/scheduled-out-today.component.jsx
+++ b/client/src/components/dashboard-components/scheduled-out-today/scheduled-out-today.component.jsx
@@ -256,9 +256,9 @@ export default function DashboardScheduledOutToday({ data, ...cardProps }) {
       responsive: ["md"],
       render: (text, record) => (
         <Space size="small" wrap>
-          <ChatOpenButton phone={record.ownr_ph1} jobid={record.jobid} />
+          <ChatOpenButton type={record.ownr_ph1_ty} phone={record.ownr_ph1} jobid={record.jobid} />
 
-          <ChatOpenButton phone={record.ownr_ph2} jobid={record.jobid} />
+          <ChatOpenButton type={record.ownr_ph2_ty} phone={record.ownr_ph2} jobid={record.jobid} />
         </Space>
       )
     },
@@ -397,6 +397,8 @@ export const DashboardScheduledOutTodayGql = `
       ownr_ln
       ownr_ph1
       ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
       production_vars
       ro_number
       scheduled_completion
diff --git a/client/src/components/global-search/global-search-os.component.jsx b/client/src/components/global-search/global-search-os.component.jsx
index 2d4307344..2280f6c6d 100644
--- a/client/src/components/global-search/global-search-os.component.jsx
+++ b/client/src/components/global-search/global-search-os.component.jsx
@@ -73,8 +73,8 @@ export default function GlobalSearchOs() {
                       <span>
                         <OwnerNameDisplay ownerObject={owner} />
                       </span>
-                      <PhoneNumberFormatter>{owner.ownr_ph1}</PhoneNumberFormatter>
-                      <PhoneNumberFormatter>{owner.ownr_ph2}</PhoneNumberFormatter>
+                      <PhoneNumberFormatter type={owner?.ownr_ph1_ty}>{owner.ownr_ph1}</PhoneNumberFormatter>
+                      <PhoneNumberFormatter type={owner?.ownr_ph2_ty}>{owner.ownr_ph2}</PhoneNumberFormatter>
                     </Space>
                   </Link>
                 )
diff --git a/client/src/components/global-search/global-search.component.jsx b/client/src/components/global-search/global-search.component.jsx
index 3a9e29f77..c1fead582 100644
--- a/client/src/components/global-search/global-search.component.jsx
+++ b/client/src/components/global-search/global-search.component.jsx
@@ -63,8 +63,8 @@ export default function GlobalSearch() {
                     <span>
                       <OwnerNameDisplay ownerObject={owner} />
                     </span>
-                    <PhoneNumberFormatter>{owner.ownr_ph1}</PhoneNumberFormatter>
-                    <PhoneNumberFormatter>{owner.ownr_ph2}</PhoneNumberFormatter>
+                    <PhoneNumberFormatter type={owner.ownr_ph1_ty}>{owner.ownr_ph1}</PhoneNumberFormatter>
+                    <PhoneNumberFormatter type={owner.ownr_ph2_ty}>{owner.ownr_ph2}</PhoneNumberFormatter>
                   </Space>
                 </Link>
               )
diff --git a/client/src/components/job-at-change/schedule-event.component.jsx b/client/src/components/job-at-change/schedule-event.component.jsx
index acaf839db..afdfd016a 100644
--- a/client/src/components/job-at-change/schedule-event.component.jsx
+++ b/client/src/components/job-at-change/schedule-event.component.jsx
@@ -220,10 +220,10 @@ export function ScheduleEventComponent({
           </DataLabel>
           <DataLabel label={t("jobs.fields.ownr_ea")}>{(event.job && event.job.ownr_ea) || ""}</DataLabel>
           <DataLabel label={t("jobs.fields.ownr_ph1")}>
-            <ChatOpenButton phone={event.job && event.job.ownr_ph1} jobid={event.job.id} />
+            <ChatOpenButton phone={event?.job?.ownr_ph1} type={event?.job?.ownr_ph1_ty} jobid={event.job.id} />
           </DataLabel>
           <DataLabel label={t("jobs.fields.ownr_ph2")}>
-            <ChatOpenButton phone={event.job && event.job.ownr_ph2} jobid={event.job.id} />
+            <ChatOpenButton phone={event?.job?.ownr_ph2} type={event?.job?.ownr_ph2_ty} jobid={event.job.id} />
           </DataLabel>
           <DataLabel hideIfNull label={t("jobs.fields.loss_of_use")}>
             {(event.job && event.job.loss_of_use) || ""}
diff --git a/client/src/components/jobs-create-owner-info/jobs-create-owner-info.new.component.jsx b/client/src/components/jobs-create-owner-info/jobs-create-owner-info.new.component.jsx
index 915509881..5509415a1 100644
--- a/client/src/components/jobs-create-owner-info/jobs-create-owner-info.new.component.jsx
+++ b/client/src/components/jobs-create-owner-info/jobs-create-owner-info.new.component.jsx
@@ -1,4 +1,4 @@
-import { Form, Input } from "antd";
+import { Form, Input, Select } from "antd";
 import { useContext } from "react";
 import { useTranslation } from "react-i18next";
 import JobCreateContext from "../../pages/jobs-create/jobs-create.context";
@@ -7,6 +7,11 @@ import FormItemPhone, { PhoneItemFormatterValidation } from "../form-items-forma
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 
 export default function JobsCreateOwnerInfoNewComponent() {
+  const PHONE_TYPE_OPTIONS = [
+    { label: t("owners.labels.home"), value: "Home" },
+    { label: t("owners.labels.work"), value: "Work" },
+    { label: t("owners.labels.cell"), value: "Cell" }
+  ];
   const [state] = useContext(JobCreateContext);
 
   const { t } = useTranslation();
@@ -105,26 +110,56 @@ export default function JobsCreateOwnerInfoNewComponent() {
           ]}
           name={["owner", "data", "ownr_ea"]}
         >
-          <FormItemEmail
-            //email={form.getFieldValue("ownr_ea")}
-            disabled={!state.owner.new}
-          />
+          <FormItemEmail disabled={!state.owner.new} />
         </Form.Item>
-        <Form.Item
-          label={t("owners.fields.ownr_ph1")}
-          name={["owner", "data", "ownr_ph1"]}
-          rules={[({ getFieldValue }) => PhoneItemFormatterValidation(getFieldValue, "owner.data.ownr_ph1")]}
-        >
-          <FormItemPhone disabled={!state.owner.new} />
+
+        {/* Phone 1 + Type */}
+        <Form.Item label={t("owners.fields.ownr_ph1")} style={{ marginBottom: 0 }}>
+          <div style={{ display: "flex", alignItems: "center", gap: 8 }}>
+            <Form.Item
+              name={["owner", "data", "ownr_ph1"]}
+              noStyle
+              rules={[({ getFieldValue }) => PhoneItemFormatterValidation(getFieldValue, "owner.data.ownr_ph1")]}
+            >
+              <FormItemPhone disabled={!state.owner.new} style={{ flex: 1, minWidth: 150 }} />
+            </Form.Item>
+
+            <Form.Item name={["owner", "data", "ownr_ph1_ty"]} noStyle>
+              <Select
+                disabled={!state.owner.new}
+                allowClear
+                placeholder="Type"
+                options={PHONE_TYPE_OPTIONS}
+                style={{ width: 110 }}
+              />
+            </Form.Item>
+          </div>
         </Form.Item>
-        <Form.Item
-          label={t("owners.fields.ownr_ph2")}
-          name={["owner", "data", "ownr_ph2"]}
-          rules={[({ getFieldValue }) => PhoneItemFormatterValidation(getFieldValue, "owner.data.ownr_ph2")]}
-        >
-          <FormItemPhone disabled={!state.owner.new} />
+
+        {/* Phone 2 + Type */}
+        <Form.Item label={t("owners.fields.ownr_ph2")} style={{ marginBottom: 0 }}>
+          <div style={{ display: "flex", alignItems: "center", gap: 8 }}>
+            <Form.Item
+              name={["owner", "data", "ownr_ph2"]}
+              noStyle
+              rules={[({ getFieldValue }) => PhoneItemFormatterValidation(getFieldValue, "owner.data.ownr_ph2")]}
+            >
+              <FormItemPhone disabled={!state.owner.new} style={{ flex: 1, minWidth: 150 }} />
+            </Form.Item>
+
+            <Form.Item name={["owner", "data", "ownr_ph2_ty"]} noStyle>
+              <Select
+                disabled={!state.owner.new}
+                allowClear
+                placeholder="Type"
+                options={PHONE_TYPE_OPTIONS}
+                style={{ width: 110 }}
+              />
+            </Form.Item>
+          </div>
         </Form.Item>
       </LayoutFormRow>
+
       <LayoutFormRow grow>
         <Form.Item label={t("owners.fields.preferred_contact")} name={["owner", "data", "preferred_contact"]}>
           <Input disabled={!state.owner.new} />
diff --git a/client/src/components/jobs-create-owner-info/jobs-create-owner-info.search.component.jsx b/client/src/components/jobs-create-owner-info/jobs-create-owner-info.search.component.jsx
index 9f93f4362..9693d4f67 100644
--- a/client/src/components/jobs-create-owner-info/jobs-create-owner-info.search.component.jsx
+++ b/client/src/components/jobs-create-owner-info/jobs-create-owner-info.search.component.jsx
@@ -61,7 +61,7 @@ export default function JobsCreateOwnerInfoSearchComponent({ loading, owners })
       title: t("owners.fields.ownr_ph1"),
       dataIndex: "ownr_ph1",
       key: "ownr_ph1",
-      render: (text, record) => <PhoneFormatter>{record.ownr_ph1}</PhoneFormatter>,
+      render: (text, record) => <PhoneFormatter type={record.ownr_ph1_ty}>{record.ownr_ph1}</PhoneFormatter>,
       sorter: (a, b) => alphaSort(a.ownr_ph1, b.ownr_ph1),
       sortOrder: tableState.sortedInfo.columnKey === "ownr_ph1" && tableState.sortedInfo.order
     },
@@ -69,7 +69,7 @@ export default function JobsCreateOwnerInfoSearchComponent({ loading, owners })
       title: t("owners.fields.ownr_ph2"),
       dataIndex: "ownr_ph2",
       key: "ownr_ph2",
-      render: (text, record) => <PhoneFormatter>{record.ownr_ph2}</PhoneFormatter>,
+      render: (text, record) => <PhoneFormatter type={record.ownr_ph2_ty}>{record.ownr_ph2}</PhoneFormatter>,
       sorter: (a, b) => alphaSort(a.ownr_ph2, b.ownr_ph2),
       sortOrder: tableState.sortedInfo.columnKey === "ownr_ph2" && tableState.sortedInfo.order
     }
diff --git a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
index 5ba5ce89e..80962c912 100644
--- a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
+++ b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
@@ -251,16 +251,16 @@ export function JobsDetailHeader({ job, bodyshop, disabled, insertAuditTrail, is
             <div>
               <DataLabel key="2" label={t("jobs.fields.ownr_ph1")}>
                 {disabled || isPartsEntry ? (
-                  <PhoneNumberFormatter>{job.ownr_ph1}</PhoneNumberFormatter>
+                  <PhoneNumberFormatter type={job.ownr_ph1_ty}>{job.ownr_ph1}</PhoneNumberFormatter>
                 ) : (
-                  <ChatOpenButton phone={job.ownr_ph1} jobid={job.id} />
+                  <ChatOpenButton type={job.ownr_ph1_ty} phone={job.ownr_ph1} jobid={job.id} />
                 )}
               </DataLabel>
               <DataLabel key="22" label={t("jobs.fields.ownr_ph2")}>
                 {disabled || isPartsEntry ? (
-                  <PhoneNumberFormatter>{job.ownr_ph2}</PhoneNumberFormatter>
+                  <PhoneNumberFormatter type={job.ownr_ph2_ty}>{job.ownr_ph2}</PhoneNumberFormatter>
                 ) : (
-                  <ChatOpenButton phone={job.ownr_ph2} jobid={job.id} />
+                  <ChatOpenButton type={job.ownr_ph2_ty} phone={job.ownr_ph2} jobid={job.id} />
                 )}
               </DataLabel>
               <DataLabel key="3" label={t("owners.fields.address")}>
diff --git a/client/src/components/jobs-find-modal/jobs-find-modal.component.jsx b/client/src/components/jobs-find-modal/jobs-find-modal.component.jsx
index a70e3d118..cf1679734 100644
--- a/client/src/components/jobs-find-modal/jobs-find-modal.component.jsx
+++ b/client/src/components/jobs-find-modal/jobs-find-modal.component.jsx
@@ -64,7 +64,11 @@ export default function JobsFindModalComponent({
       width: "12%",
       ellipsis: true,
       render: (text, record) => {
-        return record.ownr_ph1 ? <PhoneFormatter>{record.ownr_ph1}</PhoneFormatter> : t("general.labels.unknown");
+        return record.ownr_ph1 ? (
+          <PhoneFormatter type={record.ownr_ph1_ty}>{record.ownr_ph1}</PhoneFormatter>
+        ) : (
+          t("general.labels.unknown")
+        );
       }
     },
     {
@@ -74,7 +78,11 @@ export default function JobsFindModalComponent({
       width: "12%",
       ellipsis: true,
       render: (text, record) => {
-        return record.ownr_ph2 ? <PhoneFormatter>{record.ownr_ph2}</PhoneFormatter> : t("general.labels.unknown");
+        return record.ownr_ph2 ? (
+          <PhoneFormatter type={record.ownr_ph2_ty}>{record.ownr_ph2}</PhoneFormatter>
+        ) : (
+          t("general.labels.unknown")
+        );
       }
     },
     {
@@ -245,7 +253,11 @@ export default function JobsFindModalComponent({
         >
           {t("jobs.labels.override_header")}
         </Checkbox>
-        <Checkbox checked={partsQueueToggle} onChange={(e) => setPartsQueueToggle(e.target.checked)} id="parts_queue_toggle">
+        <Checkbox
+          checked={partsQueueToggle}
+          onChange={(e) => setPartsQueueToggle(e.target.checked)}
+          id="parts_queue_toggle"
+        >
           {t("bodyshop.fields.md_functionality_toggles.parts_queue_toggle")}
         </Checkbox>
         <Checkbox
diff --git a/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx b/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
index 26ec011fd..70a2f27ef 100644
--- a/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
+++ b/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
@@ -72,14 +72,14 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       dataIndex: "ownr_ph1",
       key: "ownr_ph1",
       ellipsis: true,
-      render: (text, record) => <StartChatButton phone={record.ownr_ph1} jobid={record.id} />
+      render: (text, record) => <StartChatButton type={record.ownr_ph1_ty} phone={record.ownr_ph1} jobid={record.id} />
     },
     {
       title: t("jobs.fields.ownr_ph2"),
       dataIndex: "ownr_ph2",
       key: "ownr_ph2",
       ellipsis: true,
-      render: (text, record) => <StartChatButton phone={record.ownr_ph2} jobid={record.id} />
+      render: (text, record) => <StartChatButton type={record.ownr_ph2_ty} phone={record.ownr_ph2} jobid={record.id} />
     },
     {
       title: t("jobs.fields.status"),
diff --git a/client/src/components/jobs-list/jobs-list.component.jsx b/client/src/components/jobs-list/jobs-list.component.jsx
index bde88d161..efe52e959 100644
--- a/client/src/components/jobs-list/jobs-list.component.jsx
+++ b/client/src/components/jobs-list/jobs-list.component.jsx
@@ -139,7 +139,7 @@ export function JobsList({ bodyshop }) {
       key: "ownr_ph1",
       ellipsis: true,
       responsive: ["md"],
-      render: (text, record) => <ChatOpenButton phone={record.ownr_ph1} jobid={record.id} />
+      render: (text, record) => <ChatOpenButton type={record.ownr_ph1_ty} phone={record.ownr_ph1} jobid={record.id} />
     },
     {
       title: t("jobs.fields.ownr_ph2"),
@@ -147,7 +147,7 @@ export function JobsList({ bodyshop }) {
       key: "ownr_ph2",
       ellipsis: true,
       responsive: ["md"],
-      render: (text, record) => <ChatOpenButton phone={record.ownr_ph2} jobid={record.id} />
+      render: (text, record) => <ChatOpenButton type={record.ownr_ph2_ty} phone={record.ownr_ph2} jobid={record.id} />
     },
 
     {
diff --git a/client/src/components/jobs-ready-list/jobs-ready-list.component.jsx b/client/src/components/jobs-ready-list/jobs-ready-list.component.jsx
index b218b46f4..f793f6b55 100644
--- a/client/src/components/jobs-ready-list/jobs-ready-list.component.jsx
+++ b/client/src/components/jobs-ready-list/jobs-ready-list.component.jsx
@@ -140,7 +140,7 @@ export function JobsReadyList({ bodyshop }) {
       key: "ownr_ph1",
       ellipsis: true,
       responsive: ["md"],
-      render: (text, record) => <ChatOpenButton phone={record.ownr_ph1} jobid={record.id} />
+      render: (text, record) => <ChatOpenButton type={record.ownr_ph1_ty} phone={record.ownr_ph1} jobid={record.id} />
     },
     {
       title: t("jobs.fields.ownr_ph2"),
@@ -148,7 +148,7 @@ export function JobsReadyList({ bodyshop }) {
       key: "ownr_ph2",
       ellipsis: true,
       responsive: ["md"],
-      render: (text, record) => <ChatOpenButton phone={record.ownr_ph2} jobid={record.id} />
+      render: (text, record) => <ChatOpenButton type={record.ownr_ph2_ty} phone={record.ownr_ph2} jobid={record.id} />
     },
     {
       title: t("jobs.fields.status"),
diff --git a/client/src/components/owner-detail-form/owner-detail-form.component.jsx b/client/src/components/owner-detail-form/owner-detail-form.component.jsx
index 608d66fb1..09b3c86fe 100644
--- a/client/src/components/owner-detail-form/owner-detail-form.component.jsx
+++ b/client/src/components/owner-detail-form/owner-detail-form.component.jsx
@@ -1,4 +1,4 @@
-import { Form, Input, Tooltip } from "antd";
+import { Form, Input, Select, Tooltip } from "antd";
 import { CloseCircleFilled } from "@ant-design/icons";
 import { useTranslation } from "react-i18next";
 import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
@@ -10,6 +10,12 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
   const { t } = useTranslation();
   const { getFieldValue } = form;
 
+  const PHONE_TYPE_OPTIONS = [
+    { label: t("owners.labels.home"), value: "Home" },
+    { label: t("owners.labels.work"), value: "Work" },
+    { label: t("owners.labels.cell"), value: "Cell" }
+  ];
+
   return (
     <div>
       <FormFieldsChanged form={form} />
@@ -30,6 +36,7 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
           <Input disabled />
         </Form.Item>
       </LayoutFormRow>
+
       <LayoutFormRow header={t("owners.forms.address")}>
         <Form.Item label={t("owners.fields.ownr_addr1")} name="ownr_addr1">
           <Input />
@@ -50,6 +57,7 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
           <Input />
         </Form.Item>
       </LayoutFormRow>
+
       <LayoutFormRow header={t("owners.forms.contact")}>
         <Form.Item
           label={t("owners.fields.ownr_ea")}
@@ -63,6 +71,8 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
         >
           <FormItemEmail email={getFieldValue("ownr_ea")} />
         </Form.Item>
+
+        {/* Phone 1 + Type + Opt-out icon */}
         <Form.Item label={t("owners.fields.ownr_ph1")} style={{ marginBottom: 0 }}>
           <div style={{ display: "flex", alignItems: "center", gap: "8px" }}>
             <Form.Item
@@ -72,6 +82,11 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
             >
               <Input style={{ flex: 1, minWidth: "150px" }} />
             </Form.Item>
+
+            <Form.Item name="ownr_ph1_ty" noStyle>
+              <Select allowClear placeholder="Type" options={PHONE_TYPE_OPTIONS} style={{ width: 110 }} />
+            </Form.Item>
+
             {isPhone1OptedOut && (
               <Tooltip title={t("consent.text_body")}>
                 <CloseCircleFilled
@@ -88,6 +103,8 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
             )}
           </div>
         </Form.Item>
+
+        {/* Phone 2 + Type + Opt-out icon */}
         <Form.Item label={t("owners.fields.ownr_ph2")} style={{ marginBottom: 0 }}>
           <div style={{ display: "flex", alignItems: "center", gap: "8px" }}>
             <Form.Item
@@ -97,6 +114,11 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
             >
               <Input style={{ flex: 1, minWidth: "150px" }} />
             </Form.Item>
+
+            <Form.Item name="ownr_ph2_ty" noStyle>
+              <Select allowClear placeholder="Type" options={PHONE_TYPE_OPTIONS} style={{ width: 110 }} />
+            </Form.Item>
+
             {isPhone2OptedOut && (
               <Tooltip title={t("consent.text_body")}>
                 <CloseCircleFilled
@@ -113,6 +135,7 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
             )}
           </div>
         </Form.Item>
+
         <Form.Item label={t("owners.fields.preferred_contact")} name="preferred_contact">
           <Input />
         </Form.Item>
@@ -120,6 +143,7 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
           <Input />
         </Form.Item>
       </LayoutFormRow>
+
       <Form.Item label={t("owners.fields.note")} name="note">
         <Input.TextArea rows={4} />
       </Form.Item>
diff --git a/client/src/components/owner-detail-update-jobs/owner-detail-update-jobs.component.jsx b/client/src/components/owner-detail-update-jobs/owner-detail-update-jobs.component.jsx
index b021660ff..78ab8454d 100644
--- a/client/src/components/owner-detail-update-jobs/owner-detail-update-jobs.component.jsx
+++ b/client/src/components/owner-detail-update-jobs/owner-detail-update-jobs.component.jsx
@@ -25,8 +25,10 @@ export default function OwnerDetailUpdateJobsComponent({ owner, selectedJobs, di
           ownr_ea: owner["ownr_ea"],
           ownr_fn: owner["ownr_fn"],
           ownr_ph1: owner["ownr_ph1"],
+          ownr_ph1_ty: owner["ownr_ph1_ty"],
           ownr_ln: owner["ownr_ln"],
           ownr_ph2: owner["ownr_ph2"],
+          ownr_ph2_ty: owner["ownr_ph2_ty"],
           ownr_st: owner["ownr_st"],
           ownr_title: owner["ownr_title"],
           ownr_zip: owner["ownr_zip"]
diff --git a/client/src/components/owner-find-modal/owner-find-modal.component.jsx b/client/src/components/owner-find-modal/owner-find-modal.component.jsx
index 7527de91f..09067bda5 100644
--- a/client/src/components/owner-find-modal/owner-find-modal.component.jsx
+++ b/client/src/components/owner-find-modal/owner-find-modal.component.jsx
@@ -47,13 +47,13 @@ export default function OwnerFindModalComponent({
       title: t("owners.fields.ownr_ph1"),
       dataIndex: "ownr_ph1",
       key: "ownr_ph1",
-      render: (text, record) => <PhoneFormatter>{record.ownr_ph1}</PhoneFormatter>
+      render: (text, record) => <PhoneFormatter type={record.ownr_ph1_ty}>{record.ownr_ph1}</PhoneFormatter>
     },
     {
       title: t("owners.fields.ownr_ph2"),
       dataIndex: "ownr_ph2",
       key: "ownr_ph2",
-      render: (text, record) => <PhoneFormatter>{record.ownr_ph2}</PhoneFormatter>
+      render: (text, record) => <PhoneFormatter type={record.ownr_ph2_ty}>{record.ownr_ph2}</PhoneFormatter>
     },
     {
       title: t("owners.fields.note"),
diff --git a/client/src/components/owner-tag-popover/owner-tag-popover.component.jsx b/client/src/components/owner-tag-popover/owner-tag-popover.component.jsx
index 8d086e4fa..8781fd116 100644
--- a/client/src/components/owner-tag-popover/owner-tag-popover.component.jsx
+++ b/client/src/components/owner-tag-popover/owner-tag-popover.component.jsx
@@ -15,10 +15,10 @@ export default function OwnerTagPopoverComponent({ job }) {
               <OwnerNameDisplay ownerObject={job} />
             </Descriptions.Item>
             <Descriptions.Item key="2" label={t("jobs.fields.ownr_ph1")}>
-              <PhoneFormatter>{job.ownr_ph1 || ""}</PhoneFormatter>
+              <PhoneFormatter type={job.ownr_ph1_ty}>{job.ownr_ph1 || ""}</PhoneFormatter>
             </Descriptions.Item>
             <Descriptions.Item key="22" label={t("jobs.fields.ownr_ph2")}>
-              <PhoneFormatter>{job.ownr_ph2 || ""}</PhoneFormatter>
+              <PhoneFormatter type={job.ownr_ph2_ty}>{job.ownr_ph2 || ""}</PhoneFormatter>
             </Descriptions.Item>
             <Descriptions.Item key="3" label={t("owners.fields.address")}>
               {`${job.ownr_addr1 || ""} ${job.ownr_addr2 || ""} ${
@@ -36,13 +36,10 @@ export default function OwnerTagPopoverComponent({ job }) {
               <OwnerNameDisplay ownerObject={job.owner} />
             </Descriptions.Item>
             <Descriptions.Item key="2" label={t("jobs.fields.ownr_ph1")}>
-              <PhoneFormatter>{job.owner.ownr_ph1 || ""}</PhoneFormatter>
-            </Descriptions.Item>
-            <Descriptions.Item key="22" label={t("jobs.fields.ownr_ph2")}>
-              <PhoneFormatter>{job.owner.ownr_ph2 || ""}</PhoneFormatter>
+              <PhoneFormatter type={job.owner.ownr_ph1_ty}>{job.owner.ownr_ph1 || ""}</PhoneFormatter>
             </Descriptions.Item>
             <Descriptions.Item key="2" label={t("jobs.fields.ownr_ph2")}>
-              <PhoneFormatter>{job.owner.ownr_ph2 || ""}</PhoneFormatter>
+              <PhoneFormatter type={job.owner.ownr_ph2_ty}>{job.owner.ownr_ph2 || ""}</PhoneFormatter>
             </Descriptions.Item>
             <Descriptions.Item key="3" label={t("owners.fields.address")}>
               {`${job.owner.ownr_addr1 || ""} ${job.owner.ownr_addr2 || ""} ${
diff --git a/client/src/components/owners-list/owners-list.component.jsx b/client/src/components/owners-list/owners-list.component.jsx
index cd30f7824..a93e5765c 100644
--- a/client/src/components/owners-list/owners-list.component.jsx
+++ b/client/src/components/owners-list/owners-list.component.jsx
@@ -39,7 +39,7 @@ export default function OwnersListComponent({ loading, owners, total, refetch })
       dataIndex: "ownr_ph1",
       key: "ownr_ph1",
       render: (text, record) => {
-        return <PhoneFormatter>{record.ownr_ph1}</PhoneFormatter>;
+        return <PhoneFormatter type={record.ownr_ph1_ty}>{record.ownr_ph1}</PhoneFormatter>;
       }
     },
     {
@@ -47,7 +47,7 @@ export default function OwnersListComponent({ loading, owners, total, refetch })
       dataIndex: "ownr_ph2",
       key: "ownr_ph2",
       render: (text, record) => {
-        return <PhoneFormatter>{record.ownr_ph2}</PhoneFormatter>;
+        return <PhoneFormatter type={record.ownr_ph2_ty}>{record.ownr_ph2}</PhoneFormatter>;
       }
     },
     {
diff --git a/client/src/components/production-list-columns/production-list-columns.data.jsx b/client/src/components/production-list-columns/production-list-columns.data.jsx
index 91dd64c45..3b1e79625 100644
--- a/client/src/components/production-list-columns/production-list-columns.data.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.data.jsx
@@ -270,14 +270,14 @@ const productionListColumnsData = ({ technician, state, activeStatuses, data, bo
       dataIndex: "ownr_ph1",
       key: "ownr_ph1",
       ellipsis: true,
-      render: (text, record) => <PhoneFormatter>{record.ownr_ph1}</PhoneFormatter>
+      render: (text, record) => <PhoneFormatter type={record.ownr_ph1_ty}>{record.ownr_ph1}</PhoneFormatter>
     },
     {
       title: i18n.t("jobs.fields.ownr_ph2"),
       dataIndex: "ownr_ph2",
       key: "ownr_ph2",
       ellipsis: true,
-      render: (text, record) => <PhoneFormatter>{record.ownr_ph2}</PhoneFormatter>
+      render: (text, record) => <PhoneFormatter type={record.ownr_ph2_ty}>{record.ownr_ph2}</PhoneFormatter>
     },
     {
       title: i18n.t("jobs.fields.specialcoveragepolicy"),
diff --git a/client/src/components/production-list-detail/production-list-detail.component.jsx b/client/src/components/production-list-detail/production-list-detail.component.jsx
index d05110fc5..307e0409d 100644
--- a/client/src/components/production-list-detail/production-list-detail.component.jsx
+++ b/client/src/components/production-list-detail/production-list-detail.component.jsx
@@ -154,13 +154,25 @@ export function ProductionListDetail({ bodyshop, jobs, setPrintCenterContext, te
                 <OwnerNameDisplay ownerObject={theJob} />
                 {!technician ? (
                   <>
-                    <StartChatButton phone={data.jobs_by_pk.ownr_ph1} jobid={data.jobs_by_pk.id} />
-                    <StartChatButton phone={data.jobs_by_pk.ownr_ph2} jobid={data.jobs_by_pk.id} />
+                    <StartChatButton
+                      type={data.jobs_by_pk.ownr_ph1_ty}
+                      phone={data.jobs_by_pk.ownr_ph1}
+                      jobid={data.jobs_by_pk.id}
+                    />
+                    <StartChatButton
+                      type={data.jobs_by_pk.ownr_ph2_ty}
+                      phone={data.jobs_by_pk.ownr_ph2}
+                      jobid={data.jobs_by_pk.id}
+                    />
                   </>
                 ) : (
                   <>
-                    <PhoneNumberFormatter>{data.jobs_by_pk.ownr_ph1}</PhoneNumberFormatter>
-                    <PhoneNumberFormatter>{data.jobs_by_pk.ownr_ph2}</PhoneNumberFormatter>
+                    <PhoneNumberFormatter type={data.jobs_by_pk.ownr_ph1_ty}>
+                      {data.jobs_by_pk.ownr_ph1}
+                    </PhoneNumberFormatter>
+                    <PhoneNumberFormatter type={data.jobs_by_pk.ownr_ph2_ty}>
+                      {data.jobs_by_pk.ownr_ph2}
+                    </PhoneNumberFormatter>
                   </>
                 )}
               </Space>
diff --git a/client/src/graphql/appointments.queries.js b/client/src/graphql/appointments.queries.js
index c13c6a374..51117f39f 100644
--- a/client/src/graphql/appointments.queries.js
+++ b/client/src/graphql/appointments.queries.js
@@ -40,6 +40,8 @@ export const QUERY_ALL_ACTIVE_APPOINTMENTS = gql`
         ownr_fn
         ownr_ph1
         ownr_ph2
+        ownr_ph1_ty
+        ownr_ph2_ty
         ownr_ea
         clm_total
         id
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index e1775728c..2d7169d23 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -19,7 +19,9 @@ export const QUERY_ALL_ACTIVE_JOBS_PAGINATED = gql`
       ownr_ln
       ownr_co_nm
       ownr_ph1
+      ownr_ph1_ty
       ownr_ph2
+      ownr_ph2_ty
       ownr_ea
       ownerid
       comment
@@ -69,6 +71,8 @@ export const QUERY_ALL_ACTIVE_JOBS = gql`
       ownr_co_nm
       ownr_ph1
       ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
       ownr_ea
       ownerid
       comment
@@ -122,6 +126,8 @@ export const QUERY_PARTS_QUEUE = gql`
       ownr_co_nm
       ownr_ph1
       ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
       ownr_ea
       plate_no
       plate_st
@@ -179,6 +185,8 @@ export const QUERY_EXACT_JOB_IN_PRODUCTION = gql`
       clm_total
       ownr_ph1
       ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
       special_coverage_policy
       owner_owing
       production_vars
@@ -249,6 +257,8 @@ export const QUERY_EXACT_JOBS_IN_PRODUCTION = gql`
       clm_total
       ownr_ph1
       ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
       special_coverage_policy
       owner_owing
       production_vars
@@ -615,6 +625,8 @@ export const GET_JOB_BY_PK = gql`
         ownr_ln
         ownr_ph1
         ownr_ph2
+        ownr_ph1_ty
+        ownr_ph2_ty
         ownr_st
         ownr_zip
         tax_number
@@ -631,6 +643,8 @@ export const GET_JOB_BY_PK = gql`
       ownr_ln
       ownr_ph1
       ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
       ownr_st
       ownr_zip
       parts_tax_rates
@@ -714,7 +728,7 @@ export const GET_JOB_BY_PK = gql`
       v_model_yr
       v_model_desc
       v_vin
-      notes(where:{pinned: {_eq: true}}, order_by: {updated_at: desc}) {
+      notes(where: { pinned: { _eq: true } }, order_by: { updated_at: desc }) {
         created_at
         created_by
         critical
@@ -830,6 +844,8 @@ export const QUERY_JOB_CARD_DETAILS = gql`
       ownr_co_nm
       ownr_ph1
       ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
       comment
       ownr_ea
       ca_gst_registrant
@@ -1000,7 +1016,6 @@ export const QUERY_JOB_CARD_DETAILS = gql`
         key
         type
       }
-
     }
   }
 `;
@@ -1231,6 +1246,8 @@ export const GET_JOB_INFO_FOR_STRIPE = gql`
       ownr_co_nm
       ownr_ph1
       ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
       ownr_ea
     }
   }
@@ -1444,8 +1461,10 @@ export const QUERY_JOB_FOR_DUPE = gql`
       ownr_ln
       ownr_ph1
       ownr_ph1x
+      ownr_ph1_ty
       ownr_ph2
       ownr_ph2x
+      ownr_ph2_ty
       ownr_st
       ownr_title
       ownr_zip
@@ -1691,8 +1710,10 @@ export const QUERY_ALL_JOB_FIELDS = gql`
       ownr_ln
       ownr_ph1
       ownr_ph1x
+      ownr_ph1_ty
       ownr_ph2
       ownr_ph2x
+      ownr_ph2_ty
       ownr_st
       ownr_title
       ownr_zip
@@ -1830,6 +1851,8 @@ export const QUERY_ALL_JOBS_PAGINATED_STATUS_FILTERED = gql`
       ownr_co_nm
       ownr_ph1
       ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
       plate_no
       plate_st
       v_vin
@@ -1870,6 +1893,8 @@ export const QUERY_SIMPLIFIED_PARTS_PAGINATED_STATUS_FILTERED = gql`
       ownr_co_nm
       ownr_ph1
       ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
       plate_no
       plate_st
       v_vin
@@ -2118,6 +2143,8 @@ export const GET_JOB_FOR_CC_CONTRACT = gql`
       ownr_zip
       ownr_ph1
       ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
     }
   }
 `;
@@ -2416,7 +2443,7 @@ export const QUERY_PARTS_QUEUE_CARD_DETAILS = gql`
         start
         status
       }
-      notes(where:{pinned: {_eq: true}}, order_by: {updated_at: desc}) {
+      notes(where: { pinned: { _eq: true } }, order_by: { updated_at: desc }) {
         created_at
         created_by
         critical
@@ -2504,6 +2531,8 @@ export const QUERY_PARTS_QUEUE_CARD_DETAILS = gql`
       ownr_ln
       ownr_ph1
       ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
       owner {
         id
         preferred_contact
@@ -2602,6 +2631,8 @@ export const QUERY_JOBS_IN_PRODUCTION = gql`
       clm_total
       ownr_ph1
       ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
       special_coverage_policy
       owner_owing
       production_vars
diff --git a/client/src/graphql/owners.queries.js b/client/src/graphql/owners.queries.js
index de1b654b7..37389bada 100644
--- a/client/src/graphql/owners.queries.js
+++ b/client/src/graphql/owners.queries.js
@@ -8,6 +8,8 @@ export const QUERY_SEARCH_OWNER_BY_IDX = gql`
       ownr_co_nm
       ownr_ph1
       ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
       ownr_addr1
       ownr_addr2
       ownr_city
@@ -57,8 +59,10 @@ export const QUERY_OWNER_BY_ID = gql`
       ownr_ea
       ownr_fn
       ownr_ph1
+      ownr_ph1_ty
       ownr_ln
       ownr_ph2
+      ownr_ph2_ty
       ownr_st
       ownr_title
       ownr_zip
@@ -112,8 +116,10 @@ export const QUERY_ALL_OWNERS = gql`
       ownr_ea
       ownr_fn
       ownr_ph1
+      ownr_ph1_ty
       ownr_ln
       ownr_ph2
+      ownr_ph2_ty
       ownr_st
       ownr_title
       ownr_zip
@@ -136,8 +142,10 @@ export const QUERY_ALL_OWNERS_PAGINATED = gql`
       ownr_ea
       ownr_fn
       ownr_ph1
+      ownr_ph1_ty
       ownr_ln
       ownr_ph2
+      ownr_ph2_ty
       ownr_st
       ownr_title
       ownr_zip
@@ -164,8 +172,10 @@ export const QUERY_OWNER_FOR_JOB_CREATION = gql`
       ownr_ea
       ownr_fn
       ownr_ph1
+      ownr_ph1_ty
       ownr_ln
       ownr_ph2
+      ownr_ph2_ty
       ownr_st
       ownr_title
       ownr_zip
diff --git a/client/src/graphql/parts-orders.queries.js b/client/src/graphql/parts-orders.queries.js
index de51fab3d..de4f07cee 100644
--- a/client/src/graphql/parts-orders.queries.js
+++ b/client/src/graphql/parts-orders.queries.js
@@ -177,10 +177,12 @@ export const QUERY_PARTS_ORDER_OEC = gql`
         ownr_fax
         ownr_faxx
         ownr_ph1
+        ownr_ph1_ty
         ownr_fn
         ownr_ln
         ownr_ph1x
         ownr_ph2
+        ownr_ph2_ty
         ownr_ph2x
         ownr_st
         ownr_title
diff --git a/client/src/graphql/search.queries.js b/client/src/graphql/search.queries.js
index 1c1943e30..ba91fc8af 100644
--- a/client/src/graphql/search.queries.js
+++ b/client/src/graphql/search.queries.js
@@ -22,6 +22,8 @@ export const GLOBAL_SEARCH_QUERY = gql`
       ownr_co_nm
       ownr_ph1
       ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
     }
     search_vehicles(args: { search: $search }, limit: 25) {
       id
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 3dc50d4f0..12265673b 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -2595,7 +2595,10 @@
         "fromclaim": "Current Claim",
         "fromowner": "Historical Owner Record",
         "relatedjobs": "Related Jobs",
-        "updateowner": "Update Owner"
+        "updateowner": "Update Owner",
+        "work": "Work",
+        "home": "Home",
+        "cell": "Cell"
       },
       "successes": {
         "delete": "Owner deleted successfully.",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index d53efe7b8..3ed9d6e12 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -2595,7 +2595,10 @@
         "fromclaim": "",
         "fromowner": "",
         "relatedjobs": "",
-        "updateowner": ""
+        "updateowner": "",
+        "work": "",
+        "home": "",
+        "cell": ""
       },
       "successes": {
         "delete": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index ed4677891..93af4bff0 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -2595,7 +2595,10 @@
         "fromclaim": "",
         "fromowner": "",
         "relatedjobs": "",
-        "updateowner": ""
+        "updateowner": "",
+        "work": "",
+        "home": "",
+        "cell": ""
       },
       "successes": {
         "delete": "",
diff --git a/client/src/utils/PhoneFormatter.jsx b/client/src/utils/PhoneFormatter.jsx
index 0e99308cc..90fc49e50 100644
--- a/client/src/utils/PhoneFormatter.jsx
+++ b/client/src/utils/PhoneFormatter.jsx
@@ -1,7 +1,23 @@
-//import NumberFormat from "react-number-format";
+import { Typography } from "antd";
 import parsePhoneNumber from "libphonenumber-js";
 
-export default function PhoneNumberFormatter(props) {
-  const p = parsePhoneNumber(props.children || "", "CA");
-  return p ? <span>{p.formatNational()}</span> : null;
+const { Text } = Typography;
+
+export default function PhoneNumberFormatter({ children, type }) {
+  const p = parsePhoneNumber(children || "", "CA");
+  if (!p) return null;
+
+  const phone = p.formatNational();
+
+  return (
+    <span>
+      <Text>{phone}</Text>
+      {type ? (
+        <>
+          {" "}
+          <Text type="secondary">({type})</Text>
+        </>
+      ) : null}
+    </span>
+  );
 }
diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml
index 8231c2dd0..7cf11c8de 100644
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -3799,8 +3799,10 @@
           - ownr_fn
           - ownr_ln
           - ownr_ph1
+          - ownr_ph1_ty
           - ownr_ph1x
           - ownr_ph2
+          - ownr_ph2_ty
           - ownr_ph2x
           - ownr_st
           - ownr_title
@@ -4079,8 +4081,10 @@
           - ownr_fn
           - ownr_ln
           - ownr_ph1
+          - ownr_ph1_ty
           - ownr_ph1x
           - ownr_ph2
+          - ownr_ph2_ty
           - ownr_ph2x
           - ownr_st
           - ownr_title
@@ -4370,8 +4374,10 @@
           - ownr_fn
           - ownr_ln
           - ownr_ph1
+          - ownr_ph1_ty
           - ownr_ph1x
           - ownr_ph2
+          - ownr_ph2_ty
           - ownr_ph2x
           - ownr_st
           - ownr_title
@@ -5171,7 +5177,9 @@
           - ownr_fn
           - ownr_ln
           - ownr_ph1
+          - ownr_ph1_ty
           - ownr_ph2
+          - ownr_ph2_ty
           - ownr_st
           - ownr_title
           - ownr_zip
@@ -5196,7 +5204,9 @@
           - ownr_fn
           - ownr_ln
           - ownr_ph1
+          - ownr_ph1_ty
           - ownr_ph2
+          - ownr_ph2_ty
           - ownr_st
           - ownr_title
           - ownr_zip
@@ -5232,7 +5242,9 @@
           - ownr_fn
           - ownr_ln
           - ownr_ph1
+          - ownr_ph1_ty
           - ownr_ph2
+          - ownr_ph2_ty
           - ownr_st
           - ownr_title
           - ownr_zip
diff --git a/hasura/migrations/1767133700390_alter_table_public_owners_add_column_ownr_ph1_ty/down.sql b/hasura/migrations/1767133700390_alter_table_public_owners_add_column_ownr_ph1_ty/down.sql
new file mode 100644
index 000000000..ca4186489
--- /dev/null
+++ b/hasura/migrations/1767133700390_alter_table_public_owners_add_column_ownr_ph1_ty/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."owners" add column "ownr_ph1_ty" text
+--  null;
diff --git a/hasura/migrations/1767133700390_alter_table_public_owners_add_column_ownr_ph1_ty/up.sql b/hasura/migrations/1767133700390_alter_table_public_owners_add_column_ownr_ph1_ty/up.sql
new file mode 100644
index 000000000..416ac0d25
--- /dev/null
+++ b/hasura/migrations/1767133700390_alter_table_public_owners_add_column_ownr_ph1_ty/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."owners" add column "ownr_ph1_ty" text
+ null;
diff --git a/hasura/migrations/1767133729078_alter_table_public_owners_add_column_ownr_ph2_ty/down.sql b/hasura/migrations/1767133729078_alter_table_public_owners_add_column_ownr_ph2_ty/down.sql
new file mode 100644
index 000000000..21a718779
--- /dev/null
+++ b/hasura/migrations/1767133729078_alter_table_public_owners_add_column_ownr_ph2_ty/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."owners" add column "ownr_ph2_ty" text
+--  null;
diff --git a/hasura/migrations/1767133729078_alter_table_public_owners_add_column_ownr_ph2_ty/up.sql b/hasura/migrations/1767133729078_alter_table_public_owners_add_column_ownr_ph2_ty/up.sql
new file mode 100644
index 000000000..381f77c8d
--- /dev/null
+++ b/hasura/migrations/1767133729078_alter_table_public_owners_add_column_ownr_ph2_ty/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."owners" add column "ownr_ph2_ty" text
+ null;
diff --git a/hasura/migrations/1767138645058_alter_table_public_jobs_add_column_ownr_ph1_ty/down.sql b/hasura/migrations/1767138645058_alter_table_public_jobs_add_column_ownr_ph1_ty/down.sql
new file mode 100644
index 000000000..60e1189bd
--- /dev/null
+++ b/hasura/migrations/1767138645058_alter_table_public_jobs_add_column_ownr_ph1_ty/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."jobs" add column "ownr_ph1_ty" text
+--  null;
diff --git a/hasura/migrations/1767138645058_alter_table_public_jobs_add_column_ownr_ph1_ty/up.sql b/hasura/migrations/1767138645058_alter_table_public_jobs_add_column_ownr_ph1_ty/up.sql
new file mode 100644
index 000000000..3d1c0e5ea
--- /dev/null
+++ b/hasura/migrations/1767138645058_alter_table_public_jobs_add_column_ownr_ph1_ty/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "ownr_ph1_ty" text
+ null;
diff --git a/hasura/migrations/1767138667991_alter_table_public_jobs_add_column_ownr_ph2_ty/down.sql b/hasura/migrations/1767138667991_alter_table_public_jobs_add_column_ownr_ph2_ty/down.sql
new file mode 100644
index 000000000..b16896fbb
--- /dev/null
+++ b/hasura/migrations/1767138667991_alter_table_public_jobs_add_column_ownr_ph2_ty/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."jobs" add column "ownr_ph2_ty" text
+--  null;
diff --git a/hasura/migrations/1767138667991_alter_table_public_jobs_add_column_ownr_ph2_ty/up.sql b/hasura/migrations/1767138667991_alter_table_public_jobs_add_column_ownr_ph2_ty/up.sql
new file mode 100644
index 000000000..f513a8a1c
--- /dev/null
+++ b/hasura/migrations/1767138667991_alter_table_public_jobs_add_column_ownr_ph2_ty/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "ownr_ph2_ty" text
+ null;