diff --git a/src/Services/auth/O2NextGen.Auth.Web/Pages/Account/ConfirmEmail.cshtml b/src/Services/auth/O2NextGen.Auth.Web/Pages/Account/ConfirmEmail.cshtml
new file mode 100644
index 00000000..7644f84c
--- /dev/null
+++ b/src/Services/auth/O2NextGen.Auth.Web/Pages/Account/ConfirmEmail.cshtml
@@ -0,0 +1,12 @@
+@page
+@model ConfirmEmailModel
+@{
+    ViewData["Title"] = "Confirm email";
+}
+
+<h1>@ViewData["Title"]</h1>
+<div>
+    <p>
+        Thank you for confirming your email.
+    </p>
+</div>
diff --git a/src/Services/auth/O2NextGen.Auth.Web/Pages/Account/ConfirmEmail.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Web/Pages/Account/ConfirmEmail.cshtml.cs
new file mode 100644
index 00000000..e20e0b01
--- /dev/null
+++ b/src/Services/auth/O2NextGen.Auth.Web/Pages/Account/ConfirmEmail.cshtml.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using O2NextGen.Auth.Web.Data;
+
+namespace O2NextGen.Auth.Web.Pages.Account
+{
+    [AllowAnonymous]
+    public class ConfirmEmailModel : PageModel
+    {
+        private readonly UserManager<O2User> _userManager;
+
+        public ConfirmEmailModel(UserManager<O2User> userManager)
+        {
+            _userManager = userManager;
+        }
+
+        public async Task<IActionResult> OnGetAsync(string userId, string code)
+        {
+            if (userId == null || code == null)
+            {
+                return RedirectToPage("/Index");
+            }
+
+            var user = await _userManager.FindByIdAsync(userId);
+            if (user == null)
+            {
+                return NotFound($"Unable to load user with ID '{userId}'.");
+            }
+
+            var result = await _userManager.ConfirmEmailAsync(user, code);
+            if (!result.Succeeded)
+            {
+                throw new InvalidOperationException($"Error confirming email for user with ID '{userId}':");
+            }
+
+            return Page();
+        }
+    }
+}
diff --git a/src/Services/auth/O2NextGen.Auth.Web/Startup.cs b/src/Services/auth/O2NextGen.Auth.Web/Startup.cs
index a6de3e13..56f8299b 100644
--- a/src/Services/auth/O2NextGen.Auth.Web/Startup.cs
+++ b/src/Services/auth/O2NextGen.Auth.Web/Startup.cs
@@ -1,4 +1,6 @@
-using System.Threading.Tasks;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using System.Web;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Identity;
@@ -59,6 +61,7 @@ public DummyEmailSender(ILogger<DummyEmailSender> logger)
         public Task SendEmailAsync(string email, string subject, string htmlMessage)
         {
             _logger.LogWarning("EmailSender implementation is being used!!!!");
+            _logger.LogWarning($"htmlMessage = { HttpUtility.HtmlDecode(htmlMessage)}");
             return Task.CompletedTask;
         }
     }