2 files changed, 6 insertions, 12 deletions

diff --git a/modules/grils/grils.go b/modules/grils/grils.go
index fbe57e3..3663c7f 100644
--- a/modules/grils/grils.go
+++ b/modules/grils/grils.go
@@ -73,10 +73,7 @@ func (m *GrilsModule) FromID(id int) (*Gril, error) {
 }
 
 func (m *GrilsModule) viewGril(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
-        loggedIn := false
-        if user, _ := m.g.Charakterin.GetUserFromRequest(r); user != nil {
-                loggedIn = true
-        }
+        user, _ := m.g.Charakterin.GetUserFromRequest(r)
         sid := p.ByName("id")
 
         id, err := strconv.Atoi(sid)
@@ -91,8 +88,8 @@ func (m *GrilsModule) viewGril(w http.ResponseWriter, r *http.Request, p httprou
                 return
         }
 
-        data := make(map[string]interface{})
-        data["loggedIn"] = loggedIn
+        data := m.g.Renderer.DefaultData()
+        data["user"] = user
         data["gril"] = gril
 
         m.g.Renderer.RenderPage("gril", w, data)
diff --git a/modules/lists/lists.go b/modules/lists/lists.go
index 519bb36..970b15b 100644
--- a/modules/lists/lists.go
+++ b/modules/lists/lists.go
@@ -207,10 +207,7 @@ func (m *Module) ProvideDashboardData(user *charakterin.User) []grilist.Dashboar
 }
 
 func (m *Module) viewList(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
-        loggedIn := false
-        if user, _ := m.g.Charakterin.GetUserFromRequest(r); user != nil {
-                loggedIn = true
-        }
+        user, _ := m.g.Charakterin.GetUserFromRequest(r)
         sid := p.ByName("id")
 
         id, err := strconv.Atoi(sid)
@@ -225,8 +222,8 @@ func (m *Module) viewList(w http.ResponseWriter, r *http.Request, p httprouter.P
                 return
         }
 
-        data := make(map[string]interface{})
-        data["loggedIn"] = loggedIn
+        data := m.g.Renderer.DefaultData()
+        data["user"] = user
         data["list"] = list
 
         m.g.Renderer.RenderPage("list", w, data)