diff --git a/app/plugins/CoreServer/templates/MatchServers/fields-nav.inc b/app/plugins/CoreServer/templates/MatchServers/fields-nav.inc
index a5f996e57..f1b582b4a 100644
--- a/app/plugins/CoreServer/templates/MatchServers/fields-nav.inc
+++ b/app/plugins/CoreServer/templates/MatchServers/fields-nav.inc
@@ -25,15 +25,21 @@
  * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
  */
 
-$topLinks[] = [
-  'icon'  => 'list',
-  'order' => 'Default',
-  'label' => __d('core_server', 'controller.MatchServerAttributes', [99]),
-  'link'  => [
-    'plugin'          => 'CoreServer',
-    'controller'      => 'match_server_attributes',
-    'action'          => 'index',
-    'match_server_id' => $vv_obj->id
-  ],
-  'class' => ''
-];
+// If the Match Server URL is empty, then we're in the initial configuration, so we hide the
+// Match Server Attributes link so the admin doesn't try to visit that link without finishing
+// the main configuration
+
+if(!empty($vv_obj->url)) {
+  $topLinks[] = [
+    'icon'  => 'list',
+    'order' => 'Default',
+    'label' => __d('core_server', 'controller.MatchServerAttributes', [99]),
+    'link'  => [
+      'plugin'          => 'CoreServer',
+      'controller'      => 'match_server_attributes',
+      'action'          => 'index',
+      'match_server_id' => $vv_obj->id
+    ],
+    'class' => ''
+  ];
+}
\ No newline at end of file
diff --git a/app/plugins/OrcidSource/config/plugin.json b/app/plugins/OrcidSource/config/plugin.json
index ac81588e1..f7e625558 100644
--- a/app/plugins/OrcidSource/config/plugin.json
+++ b/app/plugins/OrcidSource/config/plugin.json
@@ -48,11 +48,12 @@
           "refresh_token": { "type":  "text" }
         },
         "indexes": {
-          "orcid_source_collectors_i1": {
+          "orcid_source_tokens_i1": {
             "columns": [ "orcid_source_id",  "orcid_identifier"],
             "unique": true
           },
-          "orcid_source_collectors_i2": { "columns": [ "orcid_identifier" ] }
+          "orcid_source_tokens_i2": { "columns": [ "orcid_identifier" ] },
+          "orcid_source_tokens_i3": { "needed": false, "columns": [ "orcid_source_id" ] }
         }
       },
       "petition_orcids": {