diff --git a/Wave/Components/Account/Pages/Login.razor b/Wave/Components/Account/Pages/Login.razor
index c78c389..b0409aa 100644
--- a/Wave/Components/Account/Pages/Login.razor
+++ b/Wave/Components/Account/Pages/Login.razor
@@ -10,9 +10,11 @@
 @inject NavigationManager NavigationManager
 @inject IdentityRedirectManager RedirectManager
 @inject IStringLocalizer<Login> Localizer
+@inject NavigationManager Navigation
 
 <HeadContent>
 	<meta name="robots" content="nofollow">
+	<link rel="canonical" href="@(new UriBuilder(Navigation.BaseUri) { Scheme = "https", Port = -1, Path = "/account/login" }.Uri.AbsoluteUri)" />
 </HeadContent>
 
 <PageTitle>@Localizer["Title"]</PageTitle>
diff --git a/Wave/Components/Account/Pages/Register.razor b/Wave/Components/Account/Pages/Register.razor
index 141f27f..00eeac9 100644
--- a/Wave/Components/Account/Pages/Register.razor
+++ b/Wave/Components/Account/Pages/Register.razor
@@ -15,9 +15,11 @@
 @inject NavigationManager NavigationManager
 @inject IdentityRedirectManager RedirectManager
 @inject IStringLocalizer<Register> Localizer
+@inject NavigationManager Navigation
 
 <HeadContent>
 	<meta name="robots" content="nofollow">
+	<link rel="canonical" href="@(new UriBuilder(Navigation.BaseUri) { Scheme = "https", Port = -1, Path = "/account/register" }.Uri.AbsoluteUri)" />
 </HeadContent>
 
 <PageTitle>@Localizer["Title"]</PageTitle>
diff --git a/Wave/Components/Pages/ArticleView.razor b/Wave/Components/Pages/ArticleView.razor
index b8ce439..32501b0 100644
--- a/Wave/Components/Pages/ArticleView.razor
+++ b/Wave/Components/Pages/ArticleView.razor
@@ -45,6 +45,10 @@
 			<link rel="alternate" type="application/rss+xml" title="RSS Feed on @Customizations.Value.AppName" href="/rss/rss.xml">
 			<link rel="alternate" type="application/atom+xml" title="Atom RSS Feed on @Customizations.Value.AppName" href="/rss/atom.xml">
 		}
+		
+		@if (Article is not null) {
+			<link rel="canonical" href="@ArticleUtilities.GenerateArticleLink(Article, new Uri(Navigation.BaseUri))" />
+		}
 	</HeadContent>
 }
 
diff --git a/Wave/Components/Pages/EmailSignup.razor b/Wave/Components/Pages/EmailSignup.razor
index c087af7..ee96957 100644
--- a/Wave/Components/Pages/EmailSignup.razor
+++ b/Wave/Components/Pages/EmailSignup.razor
@@ -15,6 +15,12 @@
 @inject IEmailService EmailService
 @inject EmailFactory Email
 @inject IMessageDisplay Messages
+@inject NavigationManager Navigation
+
+<HeadContent>
+	<meta name="robots" content="nofollow">
+	<link rel="canonical" href="@(new UriBuilder(Navigation.BaseUri) { Scheme = "https", Port = -1, Path = "/email/subscribe" }.Uri.AbsoluteUri)" />
+</HeadContent>
 
 <PageTitle>@(TitlePrefix + Localizer["Title"])</PageTitle>
 
diff --git a/Wave/Components/Pages/Home.razor b/Wave/Components/Pages/Home.razor
index 4413f29..73483dd 100644
--- a/Wave/Components/Pages/Home.razor
+++ b/Wave/Components/Pages/Home.razor
@@ -30,9 +30,17 @@
 		<link rel="alternate" type="application/rss+xml" title="RSS Feed on @Customizations.Value.AppName" href="/rss/rss.xml">
 		<link rel="alternate" type="application/atom+xml" title="Atom RSS Feed on @Customizations.Value.AppName" href="/rss/atom.xml">
 	}
+	
+	@if (Page > TotalPages) {
+		<meta name="robots" content="noindex">
+	} else if (Page > 0) {
+		<link rel="canonical" href="@(new UriBuilder(Navigation.BaseUri) { Scheme = "https", Query = "?page=" + Page, Port = -1 }.Uri.AbsoluteUri)" />
+	} else {
+		<link rel="canonical" href="@(new UriBuilder(Navigation.BaseUri) { Scheme = "https", Port = -1 }.Uri.AbsoluteUri)" />
+	}
 </HeadContent>
 
-<PageTitle>@(TitlePrefix + Localizer["Title"])</PageTitle>
+<PageTitle>@(TitlePrefix[..^3])</PageTitle>
 
 <div class="grid grid-cols-1 sm:grid-cols-2 xl:grid-cols-4 xl:grid-rows-4 gap-4">
 	<div class="sm:col-span-2 flex flex-col">
diff --git a/Wave/Utilities/ArticleUtilities.cs b/Wave/Utilities/ArticleUtilities.cs
index 86e9da3..72cf312 100644
--- a/Wave/Utilities/ArticleUtilities.cs
+++ b/Wave/Utilities/ArticleUtilities.cs
@@ -16,6 +16,6 @@ public static class ArticleUtilities {
 
 		if (host is null) return link;
 
-		return new Uri(host, link).AbsoluteUri;
+		return new UriBuilder("https", host.Host, -1, link).Uri.AbsoluteUri;
 	}
 }
\ No newline at end of file