diff --git a/src/main/controllers.zig b/src/main/controllers.zig
index 21305ad..d1aa26e 100644
--- a/src/main/controllers.zig
+++ b/src/main/controllers.zig
@@ -298,9 +298,8 @@ pub const Response = struct {
             @embedFile("./controllers/web/_format.tmpl.html"),
             data,
             .{
-                .community = srv.community,
+                .community = srv.context.community,
                 .user = user,
-                .user_id = srv.context.userId(),
             },
         );
 
diff --git a/src/main/controllers/web.zig b/src/main/controllers/web.zig
index 9af7100..d6e5a39 100644
--- a/src/main/controllers/web.zig
+++ b/src/main/controllers/web.zig
@@ -208,7 +208,6 @@ const global_timeline = struct {
 
         try res.template(.ok, srv, @embedFile("./web/timelines/global.tmpl.html"), .{
             .notes = timeline.items,
-            .community = srv.community,
         });
     }
 };
@@ -370,7 +369,6 @@ const cluster = struct {
         pub fn handler(_: anytype, res: anytype, srv: anytype) !void {
             const meta = try srv.getClusterMeta();
             try res.template(.ok, srv, @embedFile("./web/cluster/overview.tmpl.html"), .{
-                .community = srv.community,
                 .meta = meta,
             });
         }
diff --git a/src/main/controllers/web/_format.tmpl.html b/src/main/controllers/web/_format.tmpl.html
index a8eab83..79f839b 100644
--- a/src/main/controllers/web/_format.tmpl.html
+++ b/src/main/controllers/web/_format.tmpl.html
@@ -11,7 +11,7 @@
     <nav>
       <h1 class="title"><a href="/about">fediglam</a></h1>
       <ul>
-      {#if %user_id |$_|}
+      {#if %user |$_|}
         <li><a class="button" href="/timelines/global">Timeline</a></li>
       {#else}
         <li><a class="button" href="/about">Sign in</a></li>
diff --git a/src/main/controllers/web/cluster/overview.tmpl.html b/src/main/controllers/web/cluster/overview.tmpl.html
index 0d542f2..c59a932 100644
--- a/src/main/controllers/web/cluster/overview.tmpl.html
+++ b/src/main/controllers/web/cluster/overview.tmpl.html
@@ -1,5 +1,5 @@
 <header>
-  <h2>{ .community.name }</h2>
+  <h2>{ %community.name }</h2>
 </header>
 <nav>
   <ul>