diff --git a/app/templates/ExtIdentitySourceRecords/fields-nav.inc b/app/templates/ExtIdentitySourceRecords/fields-nav.inc
index 07c5b2b55..028a68079 100644
--- a/app/templates/ExtIdentitySourceRecords/fields-nav.inc
+++ b/app/templates/ExtIdentitySourceRecords/fields-nav.inc
@@ -26,7 +26,7 @@
  */
   
 $topLinks = [];
-if(!empty($vv_obj->external_identity_id)) {
+if(!empty($vv_obj->external_identity->id)) {
   $topLinks[] = [
     'icon' => 'visibility',
     'order' => 'Default',
@@ -34,9 +34,10 @@ if(!empty($vv_obj->external_identity_id)) {
     'link' => [
       'controller'  => 'external_identities',
       'action'      => 'view',
-      $vv_obj->external_identity_id
+      $vv_obj->external_identity->id
     ]
   ];
+  
   $topLinks[] = [
     'icon' => 'visibility',
     'order' => 'Default',
@@ -50,16 +51,15 @@ if(!empty($vv_obj->external_identity_id)) {
       ]
     ]
   ];
-
-  // primary name: $vv_obj->external_identity->person->primary_name->full_name
+  
   $subnav = [
     'name' => 'person',
     'active' => 'external_identities',
-    'subActive' => 'external_identity_roles',
+    'subActive' => 'external_identity_source_record',
     'tabsId' => $vv_obj->external_identity->person->id,
     'tabsController' => 'people',
     'subTabsId' => $vv_obj->external_identity->id,
     'subTabsController' => 'external_identities',
-    'tabsSupertitle' =>  $vv_obj->external_identity->description
+    'tabsSupertitle' => $vv_obj->external_identity->person->primary_name->full_name
   ];
 }
\ No newline at end of file
diff --git a/app/templates/element/subnavigation.php b/app/templates/element/subnavigation.php
index 5aa1f15b1..210d8f66f 100644
--- a/app/templates/element/subnavigation.php
+++ b/app/templates/element/subnavigation.php
@@ -385,6 +385,7 @@
       $curId = $this->request->getQuery($vv_primary_link);
       if(!empty($subTabsId)) {
         $curId = $subTabsId;
+        $linkFilter = ['external_identity_id' => $curId];
       } elseif(!empty($vv_ei_id)) {
         $curId = $vv_ei_id;
         $linkFilter = ['external_identity_id' => $curId];
@@ -430,6 +431,31 @@
               );
             ?>
           </li>
+          <?php /* XXX We'd like to include "Source Record" (pointing at the cached External Identity Source Record)
+                       in the External Identity subnavigation, but to persist it, we need to know how to get to 
+                       the EIS Record from the External Identity Roles screens as well. For now, we'll keep a link to 
+                       the cached record as just a topLink. Keep this block here for now in case we revisit this choice.
+          // XXX need a test for the existence of the Source Record here also.
+          <li class="list-inline-item">
+            <?php
+              // External Identity Source Record (cached)
+              $linkClass = ($subActive == 'external_identity_source_record') ? 'nav-link active' : 'nav-link';
+              if($curController == 'ExternalIdentities' && ($curAction == 'edit' || $curAction == 'view')) {
+                $curId = $vv_obj->ext_identity_source_record->id;
+              } else {
+                $curId = $vv_obj->id;
+              }
+              print $this->Html->link(
+                __d('field', 'source_record'),
+                [ 'controller' => 'ext_identity_source_records',
+                  'action' => 'view',
+                  $curId
+                ],
+                ['class' => $linkClass]
+              );
+            ?>
+          </li>
+          */ ?>
           <?php endif; ?>
         <?php endif; // person subnav ?>
       </ul>
@@ -437,3 +463,9 @@
     
   <?php endif; // end  $isExternalId ?>
 </div>
+
+<?php
+//  print '<div style="white-space: pre;">';
+//  print print_r(get_defined_vars());
+//  print '</div>';
+?>
\ No newline at end of file