diff --git a/internal/handlers/handler.go b/internal/handlers/handler.go
index 295f9db..377edff 100644
--- a/internal/handlers/handler.go
+++ b/internal/handlers/handler.go
@@ -49,7 +49,6 @@ func (h *Handler) HomeHandler(w http.ResponseWriter, r *http.Request) {
 	session, bump, err := h.auth.ValidateSessionToken(r.Context(), cookie.Value)
 
 	if err != nil {
-		log.Print(err.Error())
 		http.Error(w, "Internal Server Error", http.StatusInternalServerError)
 		return
 	}
@@ -63,6 +62,13 @@ func (h *Handler) HomeHandler(w http.ResponseWriter, r *http.Request) {
 		http.SetCookie(w, auth.NewSessionCookie(cookie.Value, false))
 	}
 
+	user, err := h.users.FindByID(r.Context(), session.UserID)
+
+	if err != nil {
+		http.Error(w, "Internal Server Error", http.StatusInternalServerError)
+		return
+	}
+
 	files := []string{
 		"./ui/html/base.tmpl",
 		"./ui/html/pages/index.tmpl",
@@ -75,7 +81,7 @@ func (h *Handler) HomeHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	err = ts.ExecuteTemplate(w, "base", nil)
+	err = ts.ExecuteTemplate(w, "base", user.Username)
 	if err != nil {
 		log.Print(err.Error())
 		http.Error(w, "Internal Server Error", http.StatusInternalServerError)
diff --git a/ui/html/base.tmpl b/ui/html/base.tmpl
index 28899de..f4a70a1 100644
--- a/ui/html/base.tmpl
+++ b/ui/html/base.tmpl
@@ -20,8 +20,6 @@
   </head>
   <body>
     <main>{{template "main" .}}</main>
-    <footer>Powered by <a href="https://go.dev/">Go</a></footer>
-    <!-- And include the JavaScript file -->
     <script src="/static/js/main.js" type="text/javascript"></script>
   </body>
 </html>
diff --git a/ui/html/pages/index.tmpl b/ui/html/pages/index.tmpl
index be6dfa3..57cc23e 100644
--- a/ui/html/pages/index.tmpl
+++ b/ui/html/pages/index.tmpl
@@ -1,6 +1,6 @@
 {{define "title"}}Home{{end}}
 
 {{define "main"}}
-    <h1>Welcome</h1>
+    <h1>Welcome {{.}}</h1>
     <button hx-post="/api/logout" class="btn">Logout</button>
 {{end}}