diff --git a/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/templates/certificates/template-certificate-reports.php b/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/templates/certificates/template-certificate-reports.php
index c4d04e0d..c033c6ed 100644
--- a/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/templates/certificates/template-certificate-reports.php
+++ b/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/templates/certificates/template-certificate-reports.php
@@ -245,7 +245,15 @@ get_header();
                                             <?php echo esc_html($event_title); ?>
                                         </a>
                                     </td>
-                                    <td><?php echo esc_html($attendee_name); ?></td>
+                                    <td>
+                                        <?php if ($attendee_id) : ?>
+                                            <a href="<?php echo esc_url(add_query_arg('attendee_id', $attendee_id, home_url('/attendee-profile/'))); ?>" title="View attendee profile">
+                                                <?php echo esc_html($attendee_name); ?>
+                                            </a>
+                                        <?php else : ?>
+                                            <?php echo esc_html($attendee_name); ?>
+                                        <?php endif; ?>
+                                    </td>
                                     <td><?php echo esc_html($generated_date); ?></td>
                                     <td>
                                         <span class="<?php echo esc_attr($status_class); ?>">
diff --git a/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/templates/email-attendees/template-email-attendees.php b/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/templates/email-attendees/template-email-attendees.php
index e2d6efd5..49f6de37 100644
--- a/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/templates/email-attendees/template-email-attendees.php
+++ b/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/templates/email-attendees/template-email-attendees.php
@@ -163,6 +163,13 @@ $site_title = get_bloginfo( 'name' );
         .hvac-attendee-checkbox {
             margin-right: 10px;
         }
+        .hvac-attendee-item a {
+            color: #0073aa;
+            text-decoration: none;
+        }
+        .hvac-attendee-item a:hover {
+            text-decoration: underline;
+        }
         .hvac-email-sent {
             background-color: #d4edda;
             color: #155724;
@@ -333,7 +340,15 @@ $site_title = get_bloginfo( 'name' );
                             <div class="hvac-attendee-item">
                                 <label>
                                     <input type="checkbox" class="hvac-attendee-checkbox" name="email_attendees[]" value="<?php echo esc_attr( $attendee['email'] ); ?>">
-                                    <strong><?php echo esc_html( $attendee['name'] ); ?></strong>
+                                    <strong>
+                                        <?php if ( ! empty( $attendee['attendee_id'] ) ) : ?>
+                                            <a href="<?php echo esc_url( add_query_arg( 'attendee_id', $attendee['attendee_id'], home_url( '/attendee-profile/' ) ) ); ?>" target="_blank" title="View attendee profile">
+                                                <?php echo esc_html( $attendee['name'] ); ?>
+                                            </a>
+                                        <?php else : ?>
+                                            <?php echo esc_html( $attendee['name'] ); ?>
+                                        <?php endif; ?>
+                                    </strong>
                                     (<?php echo esc_html( $attendee['email'] ); ?>)
                                     <?php if ( ! empty( $attendee['ticket_name'] ) ) : ?>
                                         - <?php echo esc_html( $attendee['ticket_name'] ); ?>
diff --git a/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/templates/event-summary/template-event-summary.php b/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/templates/event-summary/template-event-summary.php
index 874e5622..6562e3c7 100644
--- a/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/templates/event-summary/template-event-summary.php
+++ b/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/templates/event-summary/template-event-summary.php
@@ -268,8 +268,8 @@ get_header();
                         <?php foreach ( $transactions as $txn ) : ?>
                         <tr>
                             <td>
-                                <?php if ( ! empty( $txn['order_id'] ) ) : ?>
-                                    <a href="<?php echo esc_url( add_query_arg( 'order_id', $txn['order_id'], home_url( '/order-summary/' ) ) ); ?>" title="View order details">
+                                <?php if ( ! empty( $txn['attendee_id'] ) ) : ?>
+                                    <a href="<?php echo esc_url( add_query_arg( 'attendee_id', $txn['attendee_id'], home_url( '/attendee-profile/' ) ) ); ?>" title="View attendee profile">
                                         <?php echo esc_html( $txn['purchaser_name'] ?? 'N/A' ); ?>
                                     </a>
                                 <?php else : ?>