diff --git a/lib/clacks_web/templates/layout/app.html.eex b/lib/clacks_web/templates/layout/app.html.eex
index 6b4c291..4c2486c 100644
--- a/lib/clacks_web/templates/layout/app.html.eex
+++ b/lib/clacks_web/templates/layout/app.html.eex
@@ -13,12 +13,14 @@
         <nav role="navigation">
           <ul>
             <li><a href="/"><%= instance_name() %></a></li>
-            <li><a href="<%= Routes.frontend_path(@conn, :search) %>">Search</a></li>
+            <%= if @conn.assigns[:user] do %>
+              <li><a href="<%= Routes.frontend_path(@conn, :search) %>">Search</a></li>
+            <% end %>
           </ul>
           <ul>
             <%= if @conn.assigns[:user] do %>
               <li>
-                Logged in as <a href="<%= Routes.actor_path(@conn, :get, @conn.assigns[:user].username) %>"><%= @conn.assigns[:user].username %></a>.
+                Logged in as <a href="<%= Routes.actor_path(@conn, :get, @user.username) %>"><%= @user.username %></a>.
               </li>
               <li>
                 <%= form_for @conn, Routes.login_path(@conn, :logout), [method: :post], fn f -> %>