diff --git a/app/admin_api.py b/app/admin_api.py
index 49eb459..b565ba4 100644
--- a/app/admin_api.py
+++ b/app/admin_api.py
@@ -502,9 +502,12 @@ def check_bidirectional_status(site_id: str):
         admin_url = peer.endpoint.rstrip("/") + "/admin/sites"
         resp = requests.get(
             admin_url,
-            auth=(connection.access_key, connection.secret_key),
             timeout=10,
-            headers={"Accept": "application/json"},
+            headers={
+                "Accept": "application/json",
+                "X-Access-Key": connection.access_key,
+                "X-Secret-Key": connection.secret_key,
+            },
         )
 
         if resp.status_code == 200:
diff --git a/app/ui.py b/app/ui.py
index 1e060a5..5297c24 100644
--- a/app/ui.py
+++ b/app/ui.py
@@ -3035,9 +3035,12 @@ def check_peer_bidirectional_status(site_id: str):
         admin_url = peer.endpoint.rstrip("/") + "/admin/sites"
         resp = requests.get(
             admin_url,
-            auth=(connection.access_key, connection.secret_key),
             timeout=10,
-            headers={"Accept": "application/json"},
+            headers={
+                "Accept": "application/json",
+                "X-Access-Key": connection.access_key,
+                "X-Secret-Key": connection.secret_key,
+            },
         )
 
         if resp.status_code == 200:
diff --git a/templates/replication_wizard.html b/templates/replication_wizard.html
index f4b2057..8333fc5 100644
--- a/templates/replication_wizard.html
+++ b/templates/replication_wizard.html
@@ -28,7 +28,7 @@
             <div class="card-header bg-transparent border-0 pt-4 pb-0 px-4">
                 <h5 class="fw-semibold d-flex align-items-center gap-2 mb-1">
                     <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="currentColor" class="text-primary" viewBox="0 0 16 16">
-                        <path d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8zm7.5-6.923c-.67.204-1.335.82-1.887 1.855A7.97 7.97 0 0 0 5.145 4H7.5V1.077zM4.09 4a9.267 9.267 0 0 1 .64-1.539 6.7 6.7 0 0 1 .597-.933A7.025 7.025 0 0 0 2.255 4H4.09z"/>
+                        <path d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8m7.5-6.923c-.67.204-1.335.82-1.887 1.855A8 8 0 0 0 5.145 4H7.5zM4.09 4a9.3 9.3 0 0 1 .64-1.539 7 7 0 0 1 .597-.933A7.03 7.03 0 0 0 2.255 4zm-.582 3.5c.03-.877.138-1.718.312-2.5H1.674a7 7 0 0 0-.656 2.5zM4.847 5a12.5 12.5 0 0 0-.338 2.5H7.5V5zM8.5 5v2.5h2.99a12.5 12.5 0 0 0-.337-2.5zM4.51 8.5a12.5 12.5 0 0 0 .337 2.5H7.5V8.5zm3.99 0V11h2.653c.187-.765.306-1.608.338-2.5zM5.145 12q.208.58.468 1.068c.552 1.035 1.218 1.65 1.887 1.855V12zm.182 2.472a7 7 0 0 1-.597-.933A9.3 9.3 0 0 1 4.09 12H2.255a7 7 0 0 0 3.072 2.472M3.82 11a13.7 13.7 0 0 1-.312-2.5h-2.49a7 7 0 0 0 .656 2.5zM8.5 12v2.923c.67-.204 1.335-.82 1.887-1.855q.26-.487.468-1.068zm3.68-1h2.146c.365-.767.594-1.61.656-2.5h-2.49a13.7 13.7 0 0 1-.312 2.5m2.802-3.5a7 7 0 0 0-.656-2.5H12.18c.174.782.282 1.623.312 2.5zM11.27 2.461c.247.464.462.98.64 1.539h1.835a7 7 0 0 0-3.072-2.472c.218.284.418.598.597.933M10.855 4a8 8 0 0 0-.468-1.068C9.835 1.897 9.17 1.282 8.5 1.077V4z"/>
                     </svg>
                     Peer Site
                 </h5>
diff --git a/templates/sites.html b/templates/sites.html
index 0d88fb6..3553e87 100644
--- a/templates/sites.html
+++ b/templates/sites.html
@@ -718,8 +718,12 @@
                                 </ol>
                             </div>
                         `;
-                        wizardLink.href = '/ui/sites/replication-wizard/' + encodeURIComponent(siteId);
-                        wizardLink.classList.remove('d-none');
+                        const blockingErrors = ['NO_CONNECTION', 'CONNECTION_NOT_FOUND', 'REMOTE_UNREACHABLE', 'ENDPOINT_NOT_ALLOWED'];
+                        const hasBlockingError = data.issues && data.issues.some(i => blockingErrors.includes(i.code));
+                        if (!hasBlockingError) {
+                            wizardLink.href = '/ui/sites/peers/' + encodeURIComponent(siteId) + '/replication-wizard';
+                            wizardLink.classList.remove('d-none');
+                        }
                     }
 
                     contentDiv.innerHTML = html;