diff --git a/lib/mv_web.ex b/lib/mv_web.ex
index 08a3c23..2b1ade6 100644
--- a/lib/mv_web.ex
+++ b/lib/mv_web.ex
@@ -52,7 +52,8 @@ defmodule MvWeb do
     quote do
       use Phoenix.LiveView
 
-      on_mount MvWeb.LiveHelpers
+      on_mount {MvWeb.LiveHelpers, :default}
+      on_mount {MvWeb.LiveHelpers, :ensure_user_role_loaded}
 
       unquote(html_helpers())
     end
diff --git a/lib/mv_web/live/member_live/form.ex b/lib/mv_web/live/member_live/form.ex
index 395198a..2f3a0ff 100644
--- a/lib/mv_web/live/member_live/form.ex
+++ b/lib/mv_web/live/member_live/form.ex
@@ -21,8 +21,6 @@ defmodule MvWeb.MemberLive.Form do
   """
   use MvWeb, :live_view
 
-  on_mount {MvWeb.LiveHelpers, :ensure_user_role_loaded}
-
   import MvWeb.LiveHelpers, only: [current_actor: 1, submit_form: 3]
 
   alias Mv.MembershipFees
diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex
index f8d7323..3083d65 100644
--- a/lib/mv_web/live/member_live/index.ex
+++ b/lib/mv_web/live/member_live/index.ex
@@ -27,8 +27,6 @@ defmodule MvWeb.MemberLive.Index do
   """
   use MvWeb, :live_view
 
-  on_mount {MvWeb.LiveHelpers, :ensure_user_role_loaded}
-
   require Ash.Query
   require Logger
   import Ash.Expr
diff --git a/lib/mv_web/live/member_live/show.ex b/lib/mv_web/live/member_live/show.ex
index 359a9b2..d484672 100644
--- a/lib/mv_web/live/member_live/show.ex
+++ b/lib/mv_web/live/member_live/show.ex
@@ -22,8 +22,6 @@ defmodule MvWeb.MemberLive.Show do
   import Ash.Query
   import MvWeb.LiveHelpers, only: [current_actor: 1]
 
-  on_mount {MvWeb.LiveHelpers, :ensure_user_role_loaded}
-
   alias MvWeb.Helpers.MembershipFeeHelpers
 
   @impl true
diff --git a/lib/mv_web/live/membership_fee_type_live/form.ex b/lib/mv_web/live/membership_fee_type_live/form.ex
index 76d3bfa..fc9ee65 100644
--- a/lib/mv_web/live/membership_fee_type_live/form.ex
+++ b/lib/mv_web/live/membership_fee_type_live/form.ex
@@ -13,7 +13,6 @@ defmodule MvWeb.MembershipFeeTypeLive.Form do
   """
   use MvWeb, :live_view
 
-  on_mount {MvWeb.LiveHelpers, :ensure_user_role_loaded}
   import MvWeb.LiveHelpers, only: [current_actor: 1, submit_form: 3]
 
   require Ash.Query
diff --git a/lib/mv_web/live/membership_fee_type_live/index.ex b/lib/mv_web/live/membership_fee_type_live/index.ex
index b3eecc0..84cd26d 100644
--- a/lib/mv_web/live/membership_fee_type_live/index.ex
+++ b/lib/mv_web/live/membership_fee_type_live/index.ex
@@ -14,7 +14,6 @@ defmodule MvWeb.MembershipFeeTypeLive.Index do
   """
   use MvWeb, :live_view
 
-  on_mount {MvWeb.LiveHelpers, :ensure_user_role_loaded}
   import MvWeb.LiveHelpers, only: [current_actor: 1]
 
   require Ash.Query
diff --git a/lib/mv_web/live/role_live/form.ex b/lib/mv_web/live/role_live/form.ex
index 0ad0fdd..ea76fe8 100644
--- a/lib/mv_web/live/role_live/form.ex
+++ b/lib/mv_web/live/role_live/form.ex
@@ -17,8 +17,6 @@ defmodule MvWeb.RoleLive.Form do
 
   import MvWeb.RoleLive.Helpers, only: [format_error: 1]
 
-  on_mount {MvWeb.LiveHelpers, :ensure_user_role_loaded}
-
   @impl true
   def render(assigns) do
     ~H"""
diff --git a/lib/mv_web/live/role_live/index.ex b/lib/mv_web/live/role_live/index.ex
index 4f8e45d..091b191 100644
--- a/lib/mv_web/live/role_live/index.ex
+++ b/lib/mv_web/live/role_live/index.ex
@@ -24,8 +24,6 @@ defmodule MvWeb.RoleLive.Index do
   import MvWeb.RoleLive.Helpers,
     only: [format_error: 1, permission_set_badge_class: 1, opts_with_actor: 3]
 
-  on_mount {MvWeb.LiveHelpers, :ensure_user_role_loaded}
-
   @impl true
   def mount(_params, _session, socket) do
     actor = socket.assigns[:current_user]
diff --git a/lib/mv_web/live/role_live/show.ex b/lib/mv_web/live/role_live/show.ex
index 7184b68..0e1c7ca 100644
--- a/lib/mv_web/live/role_live/show.ex
+++ b/lib/mv_web/live/role_live/show.ex
@@ -19,8 +19,6 @@ defmodule MvWeb.RoleLive.Show do
   import MvWeb.RoleLive.Helpers,
     only: [format_error: 1, permission_set_badge_class: 1, opts_with_actor: 3]
 
-  on_mount {MvWeb.LiveHelpers, :ensure_user_role_loaded}
-
   @impl true
   def mount(%{"id" => id}, _session, socket) do
     try do
diff --git a/lib/mv_web/live/user_live/form.ex b/lib/mv_web/live/user_live/form.ex
index 7b02053..3e773cb 100644
--- a/lib/mv_web/live/user_live/form.ex
+++ b/lib/mv_web/live/user_live/form.ex
@@ -33,7 +33,6 @@ defmodule MvWeb.UserLive.Form do
   """
   use MvWeb, :live_view
 
-  on_mount {MvWeb.LiveHelpers, :ensure_user_role_loaded}
   import MvWeb.LiveHelpers, only: [current_actor: 1, submit_form: 3]
 
   @impl true
diff --git a/lib/mv_web/live/user_live/index.ex b/lib/mv_web/live/user_live/index.ex
index 5e5949e..2062ae6 100644
--- a/lib/mv_web/live/user_live/index.ex
+++ b/lib/mv_web/live/user_live/index.ex
@@ -23,7 +23,6 @@ defmodule MvWeb.UserLive.Index do
   use MvWeb, :live_view
   import MvWeb.TableComponents
 
-  on_mount {MvWeb.LiveHelpers, :ensure_user_role_loaded}
   import MvWeb.LiveHelpers, only: [current_actor: 1]
 
   @impl true
diff --git a/lib/mv_web/live/user_live/show.ex b/lib/mv_web/live/user_live/show.ex
index 4a5b5d1..641e091 100644
--- a/lib/mv_web/live/user_live/show.ex
+++ b/lib/mv_web/live/user_live/show.ex
@@ -26,7 +26,6 @@ defmodule MvWeb.UserLive.Show do
   """
   use MvWeb, :live_view
 
-  on_mount {MvWeb.LiveHelpers, :ensure_user_role_loaded}
   import MvWeb.LiveHelpers, only: [current_actor: 1]
 
   @impl true