diff --git a/church/church_people/doctype/church_person/church_person.py b/church/church_people/doctype/church_person/church_person.py
index b5f4b0a..e54cbc1 100644
--- a/church/church_people/doctype/church_person/church_person.py
+++ b/church/church_people/doctype/church_person/church_person.py
@@ -106,6 +106,22 @@ class ChurchPerson(Document):
 
 	@frappe.whitelist()
 	def new_family_from_person(self):
+		# Check if a family with this person's name already exists
+		existing_family = frappe.db.exists(
+			"Church Family", {"family_name": f"{self.last_name} - {self.first_name}"}
+		)
+
+		if existing_family:
+			# Set this person's family to the existing one
+			self.family = existing_family
+			self.is_head_of_household = False  # Not head of household in an existing family
+			self.save()
+			frappe.msgprint(
+				f"⚠️ The <a href='/app/church-family/{existing_family}'>{self.last_name} - {self.first_name}</a> family already exists. This person has been added to that family."
+			)
+
+			return  # Don't create a new family
+
 		doc = frappe.new_doc("Church Family")
 		doc.family_name = f"{self.last_name} - {self.first_name}"
 		doc.save()
diff --git a/church/church_people/print_format/__init__.py b/church/church_people/print_format/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/church/church_people/print_format/church_directory/church_directory.json b/church/church_people/print_format/church_directory/church_directory.json
index d3945b7..e54983f 100644
--- a/church/church_people/print_format/church_directory/church_directory.json
+++ b/church/church_people/print_format/church_directory/church_directory.json
@@ -10,14 +10,14 @@
  "docstatus": 0,
  "doctype": "Print Format",
  "font_size": 14,
- "html": "<style>\n    @page {\n        size: A4;\n        margin: 20mm;\n    }\n\n    body {\n        font-family: \"Georgia\", serif;\n        font-size: 13px;\n        color: #2c3e50;\n    }\n\n    .header {\n        text-align: center;\n        margin-bottom: 20px;\n    }\n\n    .header h1 {\n        text-transform: uppercase;\n        font-weight: bold;\n        letter-spacing: 1px;\n        color: #1f3c88;\n        margin-bottom: 8px;\n    }\n\n    .profile-table {\n        width: 100%;\n        border-collapse: collapse;\n    }\n\n    .photo-cell {\n        width: 220px;\n        vertical-align: top;\n    }\n\n    .photo-cell img {\n        width: 200px;\n        height: 250px;\n        object-fit: cover;\n        border-radius: 8px;\n        border: 3px solid #1f3c88;\n    }\n\n    .details-cell {\n        vertical-align: top;\n        padding-left: 30px;\n    }\n\n    .name {\n        font-size: 24px;\n        font-weight: bold;\n        border-bottom: 1px solid #e0e0e0;\n        padding-bottom: 4px;\n        margin-bottom: 8px;\n    }\n\n    .pill {\n        display: inline-block;\n        font-size: 11px;\n        font-weight: 600;\n        padding: 5px 14px;\n        border-radius: 15px;\n        margin-right: 8px;\n        margin-bottom: 4px;\n        color: white;\n    }\n\n    .pill-phone { background: #1f3c88; }\n    .pill-email { background: #8e44ad; }\n    .pill-address { background: #16a085; }\n    .pill-birthday { background: #e67e22; }\n    .pill-anniversary { background: #c0392b; }\n    .pill-member { background: #2c3e50; }\n    .pill-role { background: #2980b9; }\n    .pill-family { background: #d35400; }\n\n    .info-line {\n        margin-bottom: 6px;\n    }\n\n    .value {\n        font-size: 14px;\n        color: #34495e;\n    }\n\n    .footer {\n        margin-top: 30px;\n        text-align: center;\n        font-size: 11px;\n        color: #7f8c8d;\n    }\n\n</style>\n\n<div class=\"header\">\n    <h1>Church Directory</h1>\n</div>\n\n<table class=\"profile-table\">\n    <tr>\n        <td class=\"photo-cell\">\n            {% if doc.photo %}\n                <img src=\"{{ doc.photo }}\">\n            {% else %}\n                <img src=\"/assets/frappe/images/ui/avatar.png\">\n            {% endif %}\n        </td>\n\n        <td class=\"details-cell\">\n\n            <div class=\"name\">\n                {{ doc.full_name or (doc.first_name + \" \" + doc.last_name) }}\n            </div>\n\n            <!-- Church Roles -->\n            {% if doc.church_roles %}\n                {% for role in doc.church_roles %}\n                    <div class=\"info-line\">\n                        <span class=\"pill pill-role\">Role</span>\n                        <span class=\"value\">{{ role.role }}</span>\n                    </div>\n                {% endfor %}\n            {% endif %}\n\n            {% if doc.primary_phone %}\n                <div class=\"info-line\">\n                    <span class=\"pill pill-phone\">Phone</span>\n                    <span class=\"value\">{{ doc.primary_phone }}</span>\n                </div>\n            {% endif %}\n\n            {% if doc.email %}\n                <div class=\"info-line\">\n                    <span class=\"pill pill-email\">Email</span>\n                    <span class=\"value\">{{ doc.email }}</span>\n                </div>\n            {% endif %}\n\n            {% if doc.home_address %}\n                <div class=\"info-line\">\n                    <span class=\"pill pill-address\">Address</span>\n                    <span class=\"value\">{{ doc.home_address }}</span>\n                </div>\n            {% endif %}\n\n            {% if doc.birthday %}\n                <div class=\"info-line\">\n                    <span class=\"pill pill-birthday\">Birthday</span>\n                    <span class=\"value\">\n                        {{ frappe.utils.formatdate(doc.birthday, \"MMMM d\") }}\n                    </span>\n                </div>\n            {% endif %}\n\n            {% if doc.anniversary %}\n                <div class=\"info-line\">\n                    <span class=\"pill pill-anniversary\">Anniversary</span>\n                    <span class=\"value\">\n                        {{ frappe.utils.formatdate(doc.anniversary, \"MMMM d, yyyy\") }}\n                    </span>\n                </div>\n            {% endif %}\n\n            {% if doc.membership_date %}\n                <div class=\"info-line\">\n                    <span class=\"pill pill-member\">Member Since</span>\n                    <span class=\"value\">\n                        {{ frappe.utils.formatdate(doc.membership_date, \"MMMM d, yyyy\") }}\n                    </span>\n                </div>\n            {% endif %}\n\n            <!-- Family Members -->\n            {% if doc.family %}\n                {% for fam in doc.family %}\n                    <div class=\"info-line\">\n                        <span class=\"pill pill-family\">Family</span>\n                        <span class=\"value\">{{ fam.family_member_name }}{% if fam.relationship %} ({{ fam.relationship }}){% endif %}</span>\n                    </div>\n                {% endfor %}\n            {% endif %}\n\n        </td>\n    </tr>\n</table>\n\n<div class=\"footer\">\n    {{ frappe.utils.formatdate(frappe.utils.nowdate(), \"MMMM yyyy\") }}\n</div>\n",
+ "html": "<style>\n    @page {\n        size: A4;\n        margin: 20mm;\n    }\n\n    body {\n        font-family: \"Georgia\", serif;\n        font-size: 13px;\n        color: #2c3e50;\n    }\n\n    .header {\n        text-align: center;\n        margin-bottom: 20px;\n    }\n\n    .header h1 {\n        text-transform: uppercase;\n        font-weight: bold;\n        letter-spacing: 1px;\n        color: #1f3c88;\n        margin-bottom: 8px;\n    }\n\n    .profile-table {\n        width: 100%;\n        border-collapse: collapse;\n    }\n\n    .photo-cell {\n        width: 220px;\n        vertical-align: top;\n    }\n\n    .photo-cell img {\n        width: 200px;\n        height: 250px;\n        object-fit: cover;\n        border-radius: 8px;\n        border: 3px solid #1f3c88;\n    }\n\n    .details-cell {\n        vertical-align: top;\n        padding-left: 30px;\n    }\n\n    .name {\n        font-size: 24px;\n        font-weight: bold;\n        border-bottom: 1px solid #e0e0e0;\n        padding-bottom: 4px;\n        margin-bottom: 8px;\n    }\n\n    .pill {\n        display: inline-block;\n        font-size: 11px;\n        font-weight: 600;\n        padding: 5px 14px;\n        border-radius: 15px;\n        margin-right: 8px;\n        margin-bottom: 4px;\n        color: white;\n    }\n\n    .pill-phone { background: #1f3c88; }\n    .pill-email { background: #8e44ad; }\n    .pill-address { background: #16a085; }\n    .pill-birthday { background: #e67e22; }\n    .pill-anniversary { background: #c0392b; }\n    .pill-member { background: #2c3e50; }\n    .pill-role { background: #2980b9; }\n    .pill-family { background: #d35400; }\n\n    .info-line {\n        margin-bottom: 6px;\n    }\n\n    .value {\n        font-size: 14px;\n        color: #34495e;\n    }\n\n    .footer {\n        margin-top: 30px;\n        text-align: center;\n        font-size: 11px;\n        color: #7f8c8d;\n    }\n\n</style>\n\n<div class=\"header\">\n    <h1>Church Directory</h1>\n</div>\n\n<table class=\"profile-table\">\n    <tr>\n        <td class=\"photo-cell\">\n            {% if doc.photo %}\n                <img src=\"{{ doc.photo }}\">\n            {% else %}\n                <img src=\"/assets/frappe/images/ui/avatar.png\">\n            {% endif %}\n        </td>\n\n        <td class=\"details-cell\">\n\n            <div class=\"name\">\n                {{ doc.full_name or (doc.first_name + \" \" + doc.last_name) }}\n            </div>\n\n            <!-- Church Roles -->\n            {% if doc.church_roles %}\n                {% for role in doc.church_roles %}\n                    <div class=\"info-line\">\n                        <span class=\"pill pill-role\">Role</span>\n                        <span class=\"value\">{{ role.role }}</span>\n                    </div>\n                {% endfor %}\n            {% endif %}\n\n            {% if doc.primary_phone %}\n                <div class=\"info-line\">\n                    <span class=\"pill pill-phone\">Phone</span>\n                    <span class=\"value\">{{ doc.primary_phone }}</span>\n                </div>\n            {% endif %}\n\n            {% if doc.email %}\n                <div class=\"info-line\">\n                    <span class=\"pill pill-email\">Email</span>\n                    <span class=\"value\">{{ doc.email }}</span>\n                </div>\n            {% endif %}\n\n            {% if doc.home_address %}\n                <div class=\"info-line\">\n                    <span class=\"pill pill-address\">Address</span>\n                    <span class=\"value\">{{ doc.home_address }}</span>\n                </div>\n            {% endif %}\n\n            {% if doc.birthday %}\n                <div class=\"info-line\">\n                    <span class=\"pill pill-birthday\">Birthday</span>\n                    <span class=\"value\">\n                        {{ frappe.utils.formatdate(doc.birthday, \"MMMM d\") }}\n                    </span>\n                </div>\n            {% endif %}\n\n            {% if doc.anniversary %}\n                <div class=\"info-line\">\n                    <span class=\"pill pill-anniversary\">Anniversary</span>\n                    <span class=\"value\">\n                        {{ frappe.utils.formatdate(doc.anniversary, \"MMMM d, yyyy\") }}\n                    </span>\n                </div>\n            {% endif %}\n\n            {% if doc.membership_date %}\n                <div class=\"info-line\">\n                    <span class=\"pill pill-member\">Member Since</span>\n                    <span class=\"value\">\n                        {{ frappe.utils.formatdate(doc.membership_date, \"MMMM d, yyyy\") }}\n                    </span>\n                </div>\n            {% endif %}\n        </td>\n    </tr>\n</table>\n\n<div class=\"footer\">\n    {{ frappe.utils.formatdate(frappe.utils.nowdate(), \"MMMM yyyy\") }}\n</div>\n",
  "idx": 0,
  "line_breaks": 0,
  "margin_bottom": 15.0,
  "margin_left": 15.0,
  "margin_right": 15.0,
  "margin_top": 15.0,
- "modified": "2026-02-13 00:16:34.957246",
+ "modified": "2026-02-13 01:00:58.501895",
  "modified_by": "Administrator",
  "module": "Church People",
  "name": "Church Directory",