diff --git a/Components/Pages/Index.razor b/Components/Pages/Index.razor
index 56e6c47..8035371 100644
--- a/Components/Pages/Index.razor
+++ b/Components/Pages/Index.razor
@@ -11,7 +11,7 @@
     @if (Id is null) {
         <h1 class="text-3xl lg:text-5xl font-bold text-primary-content">Welcome to Just Short It!</h1>
         <h2 class="text-xl lg:text-3xl font-bold text-secondary-content">The KISS single-user URL shortener!</h2>
-        <a class="btn btn-primary btn-lg min-h-0 h-12" href="/Urls">Start shorting URLs</a>
+        <a class="btn btn-primary btn-lg min-h-0 h-12" href="/Urls" data-enhance-nav="false">Start shorting URLs</a>
     } else {
         <p class="text-error" aria-role="alert">@ErrorMessage</p>
     }
diff --git a/Components/Partials/LoginPartial.razor b/Components/Partials/LoginPartial.razor
index 0a2feec..6010c0f 100644
--- a/Components/Partials/LoginPartial.razor
+++ b/Components/Partials/LoginPartial.razor
@@ -1,9 +1,9 @@
 <AuthorizeView>
     <Authorized>
         <span class="mx-3">@(context.User.Identity?.Name ?? "err_username_unknown")</span>
-        <a data-enhance="false" class="btn btn-link text-secondary-content" href="/Logout">Logout</a>
+        <a data-enhance-nav="false" class="btn btn-link text-secondary-content" href="/Logout">Logout</a>
     </Authorized>
     <NotAuthorized>
-        <a data-enhance="false" class="hover:link text-secondary-content" href="/Login">Login</a>
+        <a data-enhance-nav="false" class="hover:link text-secondary-content" href="/Login">Login</a>
     </NotAuthorized>
 </AuthorizeView>