diff --git a/Wave/Components/Layout/NavMenu.razor b/Wave/Components/Layout/NavMenu.razor
index 20f5e91..e3671a3 100644
--- a/Wave/Components/Layout/NavMenu.razor
+++ b/Wave/Components/Layout/NavMenu.razor
@@ -52,7 +52,7 @@
 		<AuthorizeView>
 			<Authorized>
 				<li class="flex gap-2">
-					<NavLink href="/Account/Manage">
+					<NavLink href="/account/manage">
 						<span class="line-clamp-2">@context.User.FindFirst("FullName")!.Value</span>
 						<div class="w-8">
 							<ProfilePictureComponent Size="100" ProfileId="@context.User.FindFirst("Id")!.Value" />
@@ -60,7 +60,7 @@
 					</NavLink>
 				</li>
 				<li class="">
-					<form action="/Account/Logout" method="post">
+					<form action="/account/logout" method="post">
 						<AntiforgeryToken />
 						<input type="hidden" name="ReturnUrl" value="@_currentUrl" />
 						<button type="submit" class="flex gap-2">
@@ -75,7 +75,7 @@
 			</Authorized>
 			<NotAuthorized>
 				<li>
-					<NavLink href="/Account/Login">
+					<NavLink href="/account/login">
 						@Localizer["Login_Label"]
 						<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-5 h-5">
 							<path fill-rule="evenodd" d="M17 4.25A2.25 2.25 0 0 0 14.75 2h-5.5A2.25 2.25 0 0 0 7 4.25v2a.75.75 0 0 0 1.5 0v-2a.75.75 0 0 1 .75-.75h5.5a.75.75 0 0 1 .75.75v11.5a.75.75 0 0 1-.75.75h-5.5a.75.75 0 0 1-.75-.75v-2a.75.75 0 0 0-1.5 0v2A2.25 2.25 0 0 0 9.25 18h5.5A2.25 2.25 0 0 0 17 15.75V4.25Z" clip-rule="evenodd" />
@@ -85,7 +85,7 @@
 				</li>
 				@if (Features.Value.NativeSignup) {
 					<li>
-						<NavLink href="/Account/Register">
+						<NavLink href="/account/register">
 							@Localizer["SignUp_Label"]
 						</NavLink>
 					</li>
diff --git a/Wave/Components/Pages/Home.razor b/Wave/Components/Pages/Home.razor
index 6a2ca53..f8ed231 100644
--- a/Wave/Components/Pages/Home.razor
+++ b/Wave/Components/Pages/Home.razor
@@ -62,7 +62,7 @@
 				</a>
 			}
 			@if (Features.Value.EmailSubscriptions) {
-				<a class="btn btn-sm btn-primary" title="E-Mail Newsletter" href="/Email/Subscribe">
+				<a class="btn btn-sm btn-primary" title="E-Mail Newsletter" href="/email/subscribe">
 					E-Mail
 					<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="w-6 h-6">
 						<path d="M1.5 8.67v8.58a3 3 0 0 0 3 3h15a3 3 0 0 0 3-3V8.67l-8.928 5.493a3 3 0 0 1-3.144 0L1.5 8.67Z" />