diff --git a/templates/default/staff.tmpl b/templates/default/staff.tmpl
index ca192213..496de53e 100644
--- a/templates/default/staff.tmpl
+++ b/templates/default/staff.tmpl
@@ -9,14 +9,13 @@
 {{end}}
 
 {{define "staff-rows"}}
-{{$ctx := .}}
-    {{range $role := $ctx.Roles}}
+    {{range $role := .Roles}}
         <div class="column block">
             {{template "staff-row-title" $role}}
             <div class="columns is-multiline has-background-white-ter px-4 py-3 content-border-top">
-                {{range $user := $ctx.Users}}
-                    {{if and (eq $user.Visible 1) (eq $user.Role $role)}}
-                        {{template "djcard" $user}}
+                {{range $user := $.Users}}
+                    {{if and $user.DJ.Visible (eq $user.DJ.Role $role)}}
+                        {{template "djcard" $user.DJ}}
                     {{end}}
                 {{end}}
              </div>
@@ -39,11 +38,11 @@
     <div class="card has-background-white-bis p-4 m-2">
     	<div class="card-image">
 	<figure class="image is-square ml-0 mr-0">
-		<img src="/api/dj-image/{{.DjImage}}"/>
+		<img src="/api/dj-image/{{.Image}}"/>
 	</figure>
 	</div>
         <div class="card-content has-text-centered pt-4 pb-0">
-            <div class="title is-4 word-break-ellipsis">{{.DjName}}</div>
+            <div class="title is-4 word-break-ellipsis">{{.Name}}</div>
         </div>
     </div>
 </div>
diff --git a/website/public/staff.go b/website/public/staff.go
index 766aa5f7..52130d8a 100644
--- a/website/public/staff.go
+++ b/website/public/staff.go
@@ -2,16 +2,30 @@ package public
 
 import (
 	"net/http"
+
+	radio "github.com/R-a-dio/valkyrie"
 )
 
 type StaffInput struct {
 	SharedInput
+
+	Users []radio.User
 }
 
-func NewStaffInput(r *http.Request) StaffInput {
-	return StaffInput{
-		SharedInput: NewSharedInput(r),
+func (si StaffInput) Roles() []string {
+	return []string{"staff", "dev", "djs"}
+}
+
+func NewStaffInput(us radio.UserStorageService, r *http.Request) (*StaffInput, error) {
+	users, err := us.User(r.Context()).All()
+	if err != nil {
+		return nil, err
 	}
+
+	return &StaffInput{
+		SharedInput: NewSharedInput(r),
+		Users:       users,
+	}, nil
 }
 
 func (StaffInput) TemplateBundle() string {
@@ -19,9 +33,13 @@ func (StaffInput) TemplateBundle() string {
 }
 
 func (s State) GetStaff(w http.ResponseWriter, r *http.Request) {
-	input := NewStaffInput(r)
+	input, err := NewStaffInput(s.Storage, r)
+	if err != nil {
+		s.errorHandler(w, r, err)
+		return
+	}
 
-	err := s.Templates.Execute(w, r, input)
+	err = s.Templates.Execute(w, r, input)
 	if err != nil {
 		s.errorHandler(w, r, err)
 		return