diff --git a/Server/Areas/Identity/IdentityHostingStartup.cs b/Server/Areas/Identity/IdentityHostingStartup.cs
deleted file mode 100644
index 64f36145..00000000
--- a/Server/Areas/Identity/IdentityHostingStartup.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using Remotely.Server.Data;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.Identity.UI;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-
-[assembly: HostingStartup(typeof(Remotely.Server.Areas.Identity.IdentityHostingStartup))]
-namespace Remotely.Server.Areas.Identity
-{
-    public class IdentityHostingStartup : IHostingStartup
-    {
-        public void Configure(IWebHostBuilder builder)
-        {
-            builder.ConfigureServices((context, services) => {
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/Server/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs b/Server/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs
index 77b34040..cc3b5ddf 100644
--- a/Server/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs
+++ b/Server/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs
@@ -10,6 +10,8 @@ using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Identity.UI.Services;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.AspNetCore.WebUtilities;
+using System.Text;
 
 namespace Remotely.Server.Areas.Identity.Pages.Account.Manage
 {
@@ -132,6 +134,7 @@ namespace Remotely.Server.Areas.Identity.Pages.Account.Manage
             var userId = await _userManager.GetUserIdAsync(user);
             var email = await _userManager.GetEmailAsync(user);
             var code = await _userManager.GenerateEmailConfirmationTokenAsync(user);
+            code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code));
             var callbackUrl = Url.Page(
                 "/Account/ConfirmEmail",
                 pageHandler: null,