diff --git a/app/models/user.rb b/app/models/user.rb
index 11a29cb..372e9f5 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -23,8 +23,6 @@ class User < ApplicationRecord
 
   normalizes :email, with: -> { _1.strip.downcase }
 
-  AVAILABLE_ROLES = [ :user, :operator, :admin ]
-
   enum :role, {
     user: "user",
     operator: "operator",
diff --git a/app/views/admin/users/_user_tr.html.erb b/app/views/admin/users/_user_tr.html.erb
index 6ae068e..59bd372 100644
--- a/app/views/admin/users/_user_tr.html.erb
+++ b/app/views/admin/users/_user_tr.html.erb
@@ -25,7 +25,7 @@
   </td>
   <td class="p-2 py-3 text-nowrap">
     <span class="inline-flex -space-x-px overflow-hidden rounded-md bg-white shadow divide-x divide-gray-300">
-      <% User::AVAILABLE_ROLES.each do |role| %>
+      <% User.roles.keys.each do |role| %>
         <% if allowed_to? :change_role?, user  %>
           <% if user.role == role.to_s %>
             <%= button_to role, admin_user_path(user), method: :patch, params: { user: { role: role }}, form_class: "inline", class: "inline-block px-4 py-2 text-sm uppercase font-medium focus:relative bg-role-#{role}-light text-#{role}" %>
diff --git a/app/views/admin/users/index.html.erb b/app/views/admin/users/index.html.erb
index 421ec50..501b8d7 100644
--- a/app/views/admin/users/index.html.erb
+++ b/app/views/admin/users/index.html.erb
@@ -1,8 +1,7 @@
-<div class="w-full">
-  <% content_for :title, "Current Print Jobs" %>
-  <h1 class="text-4xl font-bold text-hsrm-gray">Benutzerliste</h1>
-  <div class="flex items-center justify-between py-4">
-    <!-- <div>
+  <% content_for :title, "Benutzerliste" %>
+<h1 class="text-4xl font-bold text-hsrm-gray">Benutzerliste</h1>
+<div class="flex items-center justify-between py-4">
+  <!-- <div>
       <div class="mt-6 md:flex md:items-center md:justify-between">
         <div class="relative flex items-center mt-4 md:mt-0">
           <span class="absolute">
@@ -40,28 +39,27 @@
           </div>
         </fieldset>
       </div> -->
-    <%= search_form_for @q, data: { turbo_frame: :admin_users, turbo_action: 'advance' }, url: admin_users_path do |f| %>
-      <%#= f.label :firstname_cont, "Vorname:" %>
-      <%#= f.search_field :firstname_cont, oninput: 'this.form.requestSubmit();' %>
-      <%#= f.label :lastname_cont, "Nachname:" %>
-      <%#= f.search_field :lastname_cont, oninput: 'this.form.requestSubmit();' %>
-      <%#= f.label :email_start, "E-Mail:" %>
-      <%#= f.search_field :email_start, oninput: 'this.form.requestSubmit();' %>
-      <%#= f.label :firstname_or_lastname_or_email_cont, "Suchen:" %>
-      <%= f.search_field :firstname_or_lastname_or_email_cont, placeholder: "Suchen", oninput: 'this.form.requestSubmit();' %>
-      <%= f.label :created_at_dategteq, "Registriert von:" %>
-      <%= f.date_field :created_at_dategteq, onchange: 'this.form.requestSubmit();'  %>
-      <%= f.label :created_at_datelteq, "bis:" %>
-      <%= f.date_field :created_at_datelteq, onchange: 'this.form.requestSubmit();'  %>
-      <%= f.label :verified_eq, "E-Mail validiert:" %>
-      <%= f.select :verified_eq, [true,false], {include_blank: "alle"}, onchange: 'this.form.requestSubmit();' %>
-      <%= f.label :role_eq, "Rolle:" %>
-      <%#= f.collection_radio_buttons :role_eq, User::AVAILABLE_ROLES, 0,0  %>
-      <%= f.select :role_eq, User::AVAILABLE_ROLES, {include_blank: "alle"}, onchange: 'this.form.requestSubmit();' %>
-      <%#= f. %>
-      <%= f.submit "Filter anwenden", class: "py-2 px-3 bg-hsrm-red hover:bg-hsrm-red-light shadow-lg text-white inline-block font-medium cursor-pointer" %>
-    <% end %>
-  </div>
+  <%= search_form_for @q, data: { turbo_frame: :admin_users, turbo_action: 'advance' }, url: admin_users_path do |f| %>
+    <%#= f.label :firstname_cont, "Vorname:" %>
+    <%#= f.search_field :firstname_cont, oninput: 'this.form.requestSubmit();' %>
+    <%#= f.label :lastname_cont, "Nachname:" %>
+    <%#= f.search_field :lastname_cont, oninput: 'this.form.requestSubmit();' %>
+    <%#= f.label :email_start, "E-Mail:" %>
+    <%#= f.search_field :email_start, oninput: 'this.form.requestSubmit();' %>
+    <%#= f.label :firstname_or_lastname_or_email_cont, "Suchen:" %>
+    <%= f.search_field :firstname_or_lastname_or_email_cont, placeholder: "Suchen", oninput: 'this.form.requestSubmit();' %>
+    <%= f.label :created_at_dategteq, "Registriert von:" %>
+    <%= f.date_field :created_at_dategteq, onchange: 'this.form.requestSubmit();'  %>
+    <%= f.label :created_at_datelteq, "bis:" %>
+    <%= f.date_field :created_at_datelteq, onchange: 'this.form.requestSubmit();'  %>
+    <%= f.label :verified_eq, "E-Mail validiert:" %>
+    <%= f.select :verified_eq, [true,false], {include_blank: "alle"}, onchange: 'this.form.requestSubmit();' %>
+    <%= f.label :role_eq, "Rolle:" %>
+    <%#= f.collection_radio_buttons :role_eq, User::AVAILABLE_ROLES, 0,0  %>
+    <%= f.select :role_eq, User.roles.keys, {include_blank: "alle"}, onchange: 'this.form.requestSubmit();' %>
+    <%#= f. %>
+    <%= f.submit "Filter anwenden", class: "py-2 px-3 bg-hsrm-red hover:bg-hsrm-red-light shadow-lg text-white inline-block font-medium cursor-pointer" %>
+  <% end %>
 </div>
 <%= turbo_frame_tag "admin_users", data: { turbo_action: 'advance'} do %>
   <div class="flex justify-between items-center">