diff --git a/.drone.yml b/.drone.yml
index e207ca0..52d48cd 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -166,7 +166,7 @@ environment:
 
 steps:
   - name: renovate
-    image: renovate/renovate:42.81
+    image: renovate/renovate:42.80
     environment:
       RENOVATE_CONFIG_FILE: "renovate_backend_config.js"
       RENOVATE_TOKEN:
diff --git a/Justfile b/Justfile
index c68c473..b835cf4 100644
--- a/Justfile
+++ b/Justfile
@@ -32,8 +32,6 @@ lint:
     mix format --check-formatted
     mix compile --warnings-as-errors
     mix credo
-    # Check that all German translations are filled (UI must be in German)
-    @bash -c 'for file in priv/gettext/de/LC_MESSAGES/*.po; do awk "/^msgid \"\"$/{header=1; next} /^msgid /{header=0} /^msgstr \"\"$/ && !header{print FILENAME\":\"NR\": \" \$0; exit 1}" "$file" || exit 1; done'
     mix gettext.extract --check-up-to-date
 
 audit:
@@ -118,4 +116,4 @@ init-prod-secrets:
 
 # Start production environment with Docker Compose
 start-prod: init-prod-secrets
-  docker compose -f docker-compose.prod.yml up -d
+  docker compose -f docker-compose.prod.yml up -d
\ No newline at end of file
diff --git a/code_review_fixes_-_membership_fee_features_e886dc4b.plan.md b/code_review_fixes_-_membership_fee_features_e886dc4b.plan.md
new file mode 100644
index 0000000..eebf419
--- /dev/null
+++ b/code_review_fixes_-_membership_fee_features_e886dc4b.plan.md
@@ -0,0 +1,318 @@
+---
+name: Code Review Fixes - Membership Fee Features
+overview: Umsetzung der validen Code Review Punkte aus beiden Reviews mit Priorisierung nach Kritikalität. Fokus auf Transaktionssicherheit, Code-Qualität, Performance und UX-Verbesserungen.
+todos:
+  - id: fix-after-action-tasks
+    content: "after_action mit Task.start → after_transaction + Task.Supervisor: Task.Supervisor zu application.ex hinzufügen, after_action Hooks in after_transaction umwandeln, Task.Supervisor.async_nolink verwenden"
+    status: pending
+  - id: reduce-code-duplication
+    content: "Code-Duplikation reduzieren: handle_cycle_generation/2 private Funktion extrahieren, alle drei Stellen (Create, Type Change, Date Change) verwenden"
+    status: pending
+    dependencies:
+      - fix-after-action-tasks
+  - id: fix-join-date-validation
+    content: "join_date Validierung: Entweder Validierung wieder hinzufügen (validate compare(:join_date, less_than_or_equal_to: &Date.utc_today/0)) oder Dokumentation anpassen"
+    status: pending
+  - id: fix-load-cycles-docs
+    content: "load_cycles_for_members: Entweder Dokumentation korrigieren (ehrlich machen) oder echte Filterung implementieren (z.B. nur letzte 2 Intervalle)"
+    status: pending
+  - id: fix-get-current-cycle-sort
+    content: "get_current_cycle nondeterministisch: Vor List.first() nach cycle_start sortieren (desc) in MembershipFeeHelpers.get_current_cycle"
+    status: pending
+  - id: fix-n1-query-member-count
+    content: "N+1 Query beheben: Aggregate auf MembershipFeeType definieren oder member_count einmalig vorab laden und in assigns cachen"
+    status: pending
+  - id: fix-assign-new-stale
+    content: "assign_new → assign: In MembershipFeesComponent.update/2 immer assign(:cycles, cycles) und assign(:available_fee_types, available_fee_types) setzen"
+    status: pending
+  - id: fix-regenerating-flag
+    content: "@regenerating auf true setzen: Direkt beim Event-Start in handle_event(\"regenerate_cycles\", ...) socket |> assign(:regenerating, true) setzen"
+    status: pending
+  - id: fix-create-cycle-parsing
+    content: "Create-cycle parsing Fix: Decimal.parse explizit behandeln und {:error, :invalid_amount} zurückgeben statt :error"
+    status: pending
+  - id: fix-delete-all-atomic
+    content: "Delete all cycles atomar: Bulk Delete Query verwenden (Ash bulk destroy oder Query-basiert) statt Enum.map"
+    status: pending
+  - id: improve-async-error-handling
+    content: "Fehlerbehandlung bei async Tasks: Strukturierte Error-Logs mit Context, optional Retry-Mechanismus oder Event-System für Benachrichtigung"
+    status: pending
+  - id: improve-format-currency
+    content: "format_currency Robustheit: Number.Currency verwenden oder robusteres Pattern Matching + Tests für Edge Cases (negative Zahlen, sehr große Zahlen)"
+    status: pending
+  - id: add-missing-typespecs
+    content: "Fehlende Typespecs: @spec für SetDefaultMembershipFeeType.change/3 hinzufügen"
+    status: pending
+  - id: fix-race-condition
+    content: "Potenzielle Race Condition: Prüfen ob Ash doppelte Auslösung verhindert, ggf. Logik anpassen (beide Änderungen in einem Hook zusammenfassen)"
+    status: pending
+  - id: extract-magic-values
+    content: "Magic Numbers/Strings: Application.get_env(:mv, :sql_sandbox, false) in Konstante/Helper extrahieren (z.B. Mv.Config.sql_sandbox?/0)"
+    status: pending
+  - id: fix-domain-consistency
+    content: "Domain-Konsistenz: Überall in MembershipFeesComponent domain: MembershipFees explizit angeben"
+    status: pending
+  - id: fix-test-helper
+    content: "Test-Helper Fix: create_cycle/3 Helper - Cleanup nur einmal im Setup oder gezielt nur auto-generierte löschen"
+    status: pending
+  - id: fix-date-utc-today-param
+    content: "Date.utc_today() Parameter: today Parameter durchgeben in get_cycle_status_for_member und Helper-Funktionen"
+    status: pending
+  - id: fix-ui-locale-input
+    content: "UI/Locale Input Fix: type=\"number\" → type=\"text\" + inputmode=\"decimal\" + serverseitig \",\" → \".\" normalisieren"
+    status: pending
+  - id: fix-delete-confirmation
+    content: "Delete-all-Confirmation robuster: String.trim() + case-insensitive Vergleich oder \"type DELETE\" Pattern"
+    status: pending
+  - id: fix-warning-state
+    content: "Warning-State Fix: Bei Decimal.parse(:error) explizit hide_amount_warning(socket) aufrufen"
+    status: pending
+  - id: fix-double-toggle
+    content: "Toggle entfernen: Toggle-Button im Spalten-Header entfernen (nur in Toolbar behalten)"
+    status: pending
+  - id: fix-format-consistency
+    content: "Format-Konsistenz: Inputs ebenfalls auf Komma ausrichten oder serverseitig normalisieren"
+    status: pending
+    dependencies:
+      - fix-ui-locale-input
+---
+
+# Code Review Fixes - Membership Fee Features
+
+## Kritische Probleme (Müssen vor Merge behoben werden)
+
+### 1. after_action mit Task.start - Transaktionsprobleme
+
+**Dateien:** `lib/membership/member.ex` (Zeilen 142, 279)
+
+**Problem:** `Task.start/1` wird innerhalb von `after_action` Hooks verwendet. `after_action` läuft innerhalb der DB-Transaktion, daher:
+
+- Tasks sehen möglicherweise noch nicht committed state
+- Tasks werden auch bei Rollback gestartet
+- Keine Supervision → Memory Leaks möglich
+
+**Lösung:**
+
+- `after_transaction` Hook verwenden (Ash Best Practice)
+- `Task.Supervisor` zum Supervision Tree hinzufügen (`lib/mv/application.ex`)
+- `Task.Supervisor.async_nolink/3` statt `Task.start/1` verwenden
+
+**Betroffene Stellen:**
+
+- Member Creation (Zeile 116-164)
+- Join/Exit Date Change (Zeile 250-301)
+
+### 2. Code-Duplikation in Cycle-Generation-Logik
+
+**Datei:** `lib/membership/member.ex`
+
+**Problem:** Cycle-Generation-Logik ist dreimal dupliziert (Create, Type Change, Date Change)
+
+**Lösung:** Extrahiere in private Funktion `handle_cycle_generation/2`
+
+## Wichtige Probleme (Sollten behoben werden)
+
+### 3. join_date Validierung entfernt, aber Dokumentation behauptet Gegenteil
+
+**Datei:** `lib/membership/member.ex` (Zeile 27, 516-518)
+
+**Problem:** Dokumentation sagt "join_date not in future", aber Validierung fehlt
+
+**Lösung:** Dokumentation anpassen
+
+### 4. load_cycles_for_members overpromises
+
+**Datei:** `lib/mv_web/member_live/index/membership_fee_status.ex` (Zeile 36-40)
+
+**Problem:** Dokumentation sagt "Only loads the relevant cycle per member" und "Filters cycles at database level", aber lädt alle Cycles
+
+**Lösung:** echte Filterung implementieren (z.B. nur letzte 2 Intervalle)
+
+### 5. get_current_cycle nondeterministisch
+
+**Datei:** `lib/mv_web/helpers/membership_fee_helpers.ex` (Zeile 178-182)
+
+**Problem:** `List.first()` ohne explizite Sortierung → Ergebnis hängt von Reihenfolge ab
+
+**Lösung:** Vor `List.first()` nach `cycle_start` sortieren (desc)
+
+### 6. N+1 Query durch get_member_count
+
+**Datei:** `lib/mv_web/live/membership_fee_type_live/index.ex` (Zeile 134-140)
+
+**Problem:** `get_member_count/1` wird pro Row aufgerufen → N+1 Query
+
+**Lösung:** Aggregate auf MembershipFeeType definieren oder einmalig vorab laden
+
+### 7. assign_new kann stale werden
+
+**Datei:** `lib/mv_web/live/member_live/show/membership_fees_component.ex` (Zeile 402-403)
+
+**Problem:** `assign_new(:cycles, ...)` und `assign_new(:available_fee_types, ...)` werden nur gesetzt, wenn Assign noch nicht existiert
+
+**Lösung:** In `update/2` immer `assign(:cycles, cycles)` / `assign(:available_fee_types, available_fee_types)` setzen
+
+### 8. @regenerating wird nie auf true gesetzt
+
+**Datei:** `lib/mv_web/live/member_live/show/membership_fees_component.ex` (Zeile 526-561)
+
+**Problem:** `regenerating` wird nur auf `false` gesetzt, nie auf `true` → Button/Spinner werden nie disabled
+
+**Lösung:** Direkt beim Event-Start `socket |> assign(:regenerating, true)` setzen
+
+### 9. Create-cycle parsing: invalid amount zeigt falsche Fehlermeldung
+
+**Datei:** `lib/mv_web/live/member_live/show/membership_fees_component.ex` (Zeile 748-812)
+
+**Problem:** `Decimal.parse/1` gibt `:error` zurück, aber `with` behandelt es als `:error` → landet in "Invalid date format" Branch
+
+**Lösung:** Explizit `{:error, :invalid_amount}` zurückgeben:
+
+```elixir
+amount = case Decimal.parse(amount_str) do
+  {d, _} -> {:ok, d}
+  :error -> {:error, :invalid_amount}
+end
+```
+
+### 10. Delete all cycles: nicht atomar
+
+**Datei:** `lib/mv_web/live/member_live/show/membership_fees_component.ex` (Zeile 666-714)
+
+**Problem:** `Enum.map(cycles, &Ash.destroy/1)` → nicht atomar, teilweise gelöscht möglich
+
+**Lösung:** Bulk Delete Query verwenden (Ash bulk destroy oder Query-basiert)
+
+### 11. Fehlerbehandlung bei async Tasks
+
+**Datei:** `lib/membership/member.ex`
+
+**Problem:** Bei Fehlern in async Tasks wird nur geloggt, aber der Benutzer erhält keine Rückmeldung. Die Member-Aktion wird als erfolgreich zurückgegeben, auch wenn die Cycle-Generierung fehlschlägt. Keine Retry-Logik oder Monitoring.
+
+**Lösung:**
+
+- Für kritische Fälle: synchron ausführen oder Retry-Mechanismus implementieren
+- Für nicht-kritische Fälle: Event-System für spätere Benachrichtigung
+- Strukturierte Error-Logs mit Context
+- Optional: Error-Tracking (Sentry, etc.)
+
+### 12. format_currency Robustheit
+
+**Datei:** `lib/mv_web/helpers/membership_fee_helpers.ex` (Zeilen 27-51)
+
+**Problem:** Die Funktion verwendet String-Manipulation für Formatierung. Edge Cases könnten problematisch sein (z.B. sehr große Zahlen, negative Werte).
+
+**Lösung:**
+
+- `Number.Currency` oder ähnliche Bibliothek verwenden
+- Oder: Robusteres Pattern Matching für Edge Cases
+- Tests für Edge Cases hinzufügen (negative Zahlen, sehr große Zahlen)
+
+### 13. Fehlende Typespecs
+
+**Datei:** `lib/membership/member/changes/set_default_membership_fee_type.ex`
+
+**Problem:** Keine `@spec` für die `change/3` Funktion.
+
+**Lösung:** Typespecs hinzufügen für bessere Dokumentation und Dialyzer-Support.
+
+### 14. Potenzielle Race Condition
+
+**Datei:** `lib/membership/member.ex` (Zeile 250-301)
+
+**Problem:** Wenn `join_date` und `exit_date` gleichzeitig geändert werden, könnte die Cycle-Generierung zweimal ausgelöst werden (einmal pro Änderung).
+
+**Lösung:** Prüfen, ob Ash dies bereits verhindert, oder Logik anpassen (z.B. beide Änderungen in einem Hook zusammenfassen).
+
+### 15. Magic Numbers/Strings
+
+**Problem:** `Application.get_env(:mv, :sql_sandbox, false)` wird mehrfach verwendet.
+
+**Lösung:** Extrahiere in Konstante oder Helper-Funktion (z.B. `Mv.Config.sql_sandbox?/0`).
+
+## Mittlere Probleme (Nice-to-have)
+
+### 16. Inconsistent use of domain
+
+**Datei:** `lib/mv_web/live/member_live/show/membership_fees_component.ex` (Zeile 819-821)
+
+**Problem:** Einige Actions verwenden `domain: MembershipFees`, andere nicht
+
+**Lösung:** Konsistent `domain` überall verwenden
+
+### 17. Tests: create_cycle/3 löscht jedes Mal alle Cycles
+
+**Datei:** `test/mv_web/member_live/index/membership_fee_status_test.exs` (Zeile 45-52)
+
+**Problem:** Helper löscht vor jedem Create alle Cycles → Tests prüfen nicht, was sie denken
+
+**Lösung:** Cleanup nur einmal im Setup oder gezielt nur auto-generierte löschen
+
+### 18. Tests/Design: Date.utc_today() macht Tests flaky
+
+**Problem:** Tests hängen von `Date.utc_today()` ab → nicht deterministisch
+
+**Lösung:** `today` Parameter durchgeben (z.B. `get_cycle_status_for_member(member, show_current, today \\ Date.utc_today())`)
+
+### 19. UI/Locale: input type="number" + Decimal/Komma
+
+**Problem:** `type="number"` funktioniert nicht zuverlässig mit Komma als Dezimaltrenner
+
+**Lösung:** `type="text"` + `inputmode="decimal"` + serverseitig "," → "." normalisieren
+
+### 20. Delete-all-Confirmation: String-Vergleich ist fragil
+
+**Datei:** `lib/mv_web/live/member_live/show/membership_fees_component.ex` (Zeile 296-298)
+
+**Problem:** String-Vergleich gegen `gettext("Yes")` und `"Yes"` → fragil bei Whitespace/Locale
+
+**Lösung:** `String.trim()` + case-insensitive Vergleich oder "type DELETE" Pattern
+
+### 21. MembershipFeeType Form: Warning-State kann hängen bleiben
+
+**Datei:** `lib/mv_web/live/membership_fee_type_live/form.ex` (Zeile 367-378)
+
+**Problem:** Bei `Decimal.parse(:error)` wird nur `socket` zurückgegeben → Warning kann stehen bleiben
+
+**Lösung:** Bei `:error` explizit `hide_amount_warning(socket)` aufrufen
+
+### 22. UI/UX: Toggle ist doppelt vorhanden
+
+**Datei:** `lib/mv_web/live/member_live/index.html.heex` (Zeile 45-72, 284-296)
+
+**Problem:** Toggle-Button sowohl in Toolbar als auch im Spalten-Header
+
+**Lösung:** Toggle im Spalten-Header entfernen (nur in Toolbar behalten)
+
+### 23. Konsistenz: format_currency vs Inputs
+
+**Problem:** `format_currency` formatiert deutsch (Komma), aber Inputs erwarten Punkt
+
+**Lösung:** Inputs ebenfalls auf Komma ausrichten oder serverseitig normalisieren
+
+## Implementierungsreihenfolge
+
+1. **Kritisch:** after_action → after_transaction + Task.Supervisor
+2. **Kritisch:** Code-Duplikation reduzieren
+3. **Wichtig:** join_date Validierung/Dokumentation
+4. **Wichtig:** load_cycles_for_members Dokumentation/Implementierung
+5. **Wichtig:** get_current_cycle Sortierung
+6. **Wichtig:** N+1 Query beheben
+7. **Wichtig:** assign_new → assign
+8. **Wichtig:** @regenerating auf true setzen
+9. **Wichtig:** Create-cycle parsing Fix
+10. **Wichtig:** Delete all cycles atomar
+11. **Wichtig:** Fehlerbehandlung bei async Tasks
+12. **Wichtig:** format_currency Robustheit
+13. **Wichtig:** Fehlende Typespecs
+14. **Wichtig:** Potenzielle Race Condition prüfen/beheben
+15. **Wichtig:** Magic Numbers/Strings extrahieren
+16. **Mittel:** Domain-Konsistenz
+17. **Mittel:** Test-Helper Fix
+18. **Mittel:** Date.utc_today() Parameter
+19. **Mittel:** UI/Locale Fixes
+20. **Mittel:** String-Vergleich robuster
+21. **Mittel:** Warning-State Fix
+22. **Mittel:** Toggle entfernen
+23. **Mittel:** Format-Konsistenz
+
diff --git a/docs/csv-member-import-v1.md b/docs/csv-member-import-v1.md
index bc8f99f..2bdbe69 100644
--- a/docs/csv-member-import-v1.md
+++ b/docs/csv-member-import-v1.md
@@ -191,26 +191,6 @@ A **basic CSV member import feature** that allows administrators to upload a CSV
   - `/templates/member_import_de.csv`
 - In LiveView, link them using Phoenix static path helpers (e.g. `~p` or `Routes.static_path/2`, depending on Phoenix version).
 
-**Example Usage in LiveView Templates:**
-
-```heex
-<!-- Using ~p sigil (Phoenix 1.7+) -->
-<.link href={~p"/templates/member_import_en.csv"} download>
-  <%= gettext("Download English Template") %>
-</.link>
-
-<.link href={~p"/templates/member_import_de.csv"} download>
-  <%= gettext("Download German Template") %>
-</.link>
-
-<!-- Alternative: Using Routes.static_path/2 -->
-<.link href={Routes.static_path(MvWeb.Endpoint, "/templates/member_import_en.csv")} download>
-  <%= gettext("Download English Template") %>
-</.link>
-```
-
-**Note:** The `templates` directory must be included in `MvWeb.static_paths()` (configured in `lib/mv_web.ex`) for the files to be served.
-
 ### File Limits
 
 - **Max file size:** 10 MB
diff --git a/docs/roles-and-permissions-architecture.md b/docs/roles-and-permissions-architecture.md
index 8c89af7..b44604b 100644
--- a/docs/roles-and-permissions-architecture.md
+++ b/docs/roles-and-permissions-architecture.md
@@ -110,8 +110,8 @@ Control access to LiveView pages:
 Three scope levels for permissions:
 - **:own** - Only records where `record.id == user.id` (for User resource)
 - **:linked** - Only records linked to user via relationships
-  - Member: `id == user.member_id` (User.member_id → Member.id, inverse relationship)
-  - CustomFieldValue: `member_id == user.member_id` (traverses Member → User relationship)
+  - Member: `member.user_id == user.id`
+  - CustomFieldValue: `custom_field_value.member.user_id == user.id`
 - **:all** - All records, no filtering
 
 **6. Special Cases**
@@ -714,8 +714,8 @@ defmodule Mv.Authorization.Checks.HasPermission do
   - **:all** - Authorizes without filtering (returns all records)
   - **:own** - Filters to records where record.id == actor.id
   - **:linked** - Filters based on resource type:
-    - Member: `id == actor.member_id` (User.member_id → Member.id, inverse relationship)
-    - CustomFieldValue: `member_id == actor.member_id` (CustomFieldValue.member_id → Member.id → User.member_id)
+    - Member: member.user_id == actor.id
+    - CustomFieldValue: custom_field_value.member.user_id == actor.id (traverses relationship!)
   
   ## Error Handling
   
@@ -799,14 +799,12 @@ defmodule Mv.Authorization.Checks.HasPermission do
   defp apply_scope(:linked, actor, resource_name) do
     case resource_name do
       "Member" -> 
-        # User.member_id → Member.id (inverse relationship)
-        # Filter: member.id == actor.member_id
-        {:filter, expr(id == ^actor.member_id)}
+        # Member.user_id == actor.id (direct relationship)
+        {:filter, expr(user_id == ^actor.id)}
       
       "CustomFieldValue" -> 
-        # CustomFieldValue.member_id → Member.id → User.member_id
-        # Filter: custom_field_value.member_id == actor.member_id
-        {:filter, expr(member_id == ^actor.member_id)}
+        # CustomFieldValue.member.user_id == actor.id (traverse through member!)
+        {:filter, expr(member.user_id == ^actor.id)}
       
       _ -> 
         # Fallback for other resources: try direct user_id
@@ -920,7 +918,7 @@ end
 
 **Location:** `lib/mv/membership/member.ex`
 
-**Special Case:** Users can always READ their linked member (where `id == user.member_id`).
+**Special Case:** Users can always access their linked member (where `member.user_id == user.id`).
 
 ```elixir
 defmodule Mv.Membership.Member do
@@ -980,10 +978,10 @@ defmodule Mv.Membership.CustomFieldValue do
   
   policies do
     # SPECIAL CASE: Users can access custom field values of their linked member
-    # Note: This uses member_id relationship (CustomFieldValue.member_id → Member.id → User.member_id)
+    # Note: This traverses the member relationship!
     policy action_type([:read, :update]) do
       description "Users can access custom field values of their linked member"
-      authorize_if expr(member_id == ^actor(:member_id))
+      authorize_if expr(member.user_id == ^actor(:id))
     end
     
     # GENERAL: Check permissions from role
diff --git a/docs/roles-and-permissions-overview.md b/docs/roles-and-permissions-overview.md
index 61aef9c..86e7273 100644
--- a/docs/roles-and-permissions-overview.md
+++ b/docs/roles-and-permissions-overview.md
@@ -294,9 +294,7 @@ Each Permission Set contains:
 **:own** - Only records where id == actor.id
 - Example: User can read their own User record
 
-**:linked** - Only records linked to actor via relationships
-- Member: `id == actor.member_id` (User.member_id → Member.id, inverse relationship)
-- CustomFieldValue: `member_id == actor.member_id` (traverses Member → User relationship)
+**:linked** - Only records where user_id == actor.id
 - Example: User can read Member linked to their account
 
 **:all** - All records without restriction
diff --git a/lib/membership/member.ex b/lib/membership/member.ex
index 41e02b1..d2ea07d 100644
--- a/lib/membership/member.ex
+++ b/lib/membership/member.ex
@@ -34,12 +34,10 @@ defmodule Mv.Membership.Member do
   """
   use Ash.Resource,
     domain: Mv.Membership,
-    data_layer: AshPostgres.DataLayer,
-    authorizers: [Ash.Policy.Authorizer]
+    data_layer: AshPostgres.DataLayer
 
   require Ash.Query
   import Ash.Expr
-  alias Mv.Helpers
   require Logger
 
   alias Mv.Membership.Helpers.VisibilityConfig
@@ -120,12 +118,11 @@ defmodule Mv.Membership.Member do
       # Only runs if membership_fee_type_id is set
       # Note: Cycle generation runs asynchronously to not block the action,
       # but in test environment it runs synchronously for DB sandbox compatibility
-      change after_transaction(fn changeset, result, _context ->
+      change after_transaction(fn _changeset, result, _context ->
                case result do
                  {:ok, member} ->
                    if member.membership_fee_type_id && member.join_date do
-                     actor = Map.get(changeset.context, :actor)
-                     handle_cycle_generation(member, actor: actor)
+                     handle_cycle_generation(member)
                    end
 
                  {:error, _} ->
@@ -196,9 +193,7 @@ defmodule Mv.Membership.Member do
                  Ash.Changeset.changing_attribute?(changeset, :membership_fee_type_id)
 
                if fee_type_changed && member.membership_fee_type_id && member.join_date do
-                 actor = Map.get(changeset.context, :actor)
-
-                 case regenerate_cycles_on_type_change(member, actor: actor) do
+                 case regenerate_cycles_on_type_change(member) do
                    {:ok, notifications} ->
                      # Return notifications to Ash - they will be sent automatically after commit
                      {:ok, member, notifications}
@@ -230,8 +225,7 @@ defmodule Mv.Membership.Member do
                    exit_date_changed = Ash.Changeset.changing_attribute?(changeset, :exit_date)
 
                    if (join_date_changed || exit_date_changed) && member.membership_fee_type_id do
-                     actor = Map.get(changeset.context, :actor)
-                     handle_cycle_generation(member, actor: actor)
+                     handle_cycle_generation(member)
                    end
 
                  {:error, _} ->
@@ -302,41 +296,6 @@ defmodule Mv.Membership.Member do
     end
   end
 
-  # Authorization Policies
-  # Order matters: Most specific policies first, then general permission check
-  policies do
-    # SYSTEM OPERATIONS: Allow CRUD operations without actor (TEST ENVIRONMENT ONLY)
-    # In test: All operations allowed (for test fixtures)
-    # In production/dev: ALL operations denied without actor (fail-closed for security)
-    # NoActor.check uses compile-time environment detection to prevent security issues
-    bypass action_type([:create, :read, :update, :destroy]) do
-      description "Allow system operations without actor (test environment only)"
-      authorize_if Mv.Authorization.Checks.NoActor
-    end
-
-    # SPECIAL CASE: Users can always READ their linked member
-    # This allows users with ANY permission set to read their own linked member
-    # Check using the inverse relationship: User.member_id → Member.id
-    bypass action_type(:read) do
-      description "Users can always read member linked to their account"
-      authorize_if expr(id == ^actor(:member_id))
-    end
-
-    # GENERAL: Check permissions from user's role
-    # HasPermission handles update permissions correctly:
-    # - :own_data → can update linked member (scope :linked)
-    # - :read_only → cannot update any member (no update permission)
-    # - :normal_user → can update all members (scope :all)
-    # - :admin → can update all members (scope :all)
-    policy action_type([:read, :create, :update, :destroy]) do
-      description "Check permissions from user's role and permission set"
-      authorize_if Mv.Authorization.Checks.HasPermission
-    end
-
-    # DEFAULT: Forbid if no policy matched
-    # Ash implicitly forbids if no policy authorized
-  end
-
   @doc """
   Filters members list based on email match priority.
 
@@ -404,13 +363,8 @@ defmodule Mv.Membership.Member do
         user_id = user_arg[:id]
         current_member_id = changeset.data.id
 
-        # Get actor from changeset context for authorization
-        # If no actor is present, this will fail in production (fail-closed)
-        actor = Map.get(changeset.context || %{}, :actor)
-
         # Check the current state of the user in the database
-        # Pass actor to ensure proper authorization (User might have policies in future)
-        case Ash.get(Mv.Accounts.User, user_id, actor: actor) do
+        case Ash.get(Mv.Accounts.User, user_id) do
           # User is free to be linked
           {:ok, %{member_id: nil}} ->
             :ok
@@ -788,37 +742,33 @@ defmodule Mv.Membership.Member do
   # Returns {:ok, notifications} or {:error, reason} where notifications are collected
   # to be sent after transaction commits
   @doc false
-  def regenerate_cycles_on_type_change(member, opts \\ []) do
+  def regenerate_cycles_on_type_change(member) do
     today = Date.utc_today()
     lock_key = :erlang.phash2(member.id)
-    actor = Keyword.get(opts, :actor)
 
     # Use advisory lock to prevent concurrent deletion and regeneration
     # This ensures atomicity when multiple updates happen simultaneously
     if Mv.Repo.in_transaction?() do
-      regenerate_cycles_in_transaction(member, today, lock_key, actor: actor)
+      regenerate_cycles_in_transaction(member, today, lock_key)
     else
-      regenerate_cycles_new_transaction(member, today, lock_key, actor: actor)
+      regenerate_cycles_new_transaction(member, today, lock_key)
     end
   end
 
   # Already in transaction: use advisory lock directly
   # Returns {:ok, notifications} - notifications should be returned to after_action hook
-  defp regenerate_cycles_in_transaction(member, today, lock_key, opts) do
-    actor = Keyword.get(opts, :actor)
+  defp regenerate_cycles_in_transaction(member, today, lock_key) do
     Ecto.Adapters.SQL.query!(Mv.Repo, "SELECT pg_advisory_xact_lock($1)", [lock_key])
-    do_regenerate_cycles_on_type_change(member, today, skip_lock?: true, actor: actor)
+    do_regenerate_cycles_on_type_change(member, today, skip_lock?: true)
   end
 
   # Not in transaction: start new transaction with advisory lock
   # Returns {:ok, notifications} - notifications should be sent by caller (e.g., via after_action)
-  defp regenerate_cycles_new_transaction(member, today, lock_key, opts) do
-    actor = Keyword.get(opts, :actor)
-
+  defp regenerate_cycles_new_transaction(member, today, lock_key) do
     Mv.Repo.transaction(fn ->
       Ecto.Adapters.SQL.query!(Mv.Repo, "SELECT pg_advisory_xact_lock($1)", [lock_key])
 
-      case do_regenerate_cycles_on_type_change(member, today, skip_lock?: true, actor: actor) do
+      case do_regenerate_cycles_on_type_change(member, today, skip_lock?: true) do
         {:ok, notifications} ->
           # Return notifications - they will be sent by the caller
           notifications
@@ -840,7 +790,6 @@ defmodule Mv.Membership.Member do
     require Ash.Query
 
     skip_lock? = Keyword.get(opts, :skip_lock?, false)
-    actor = Keyword.get(opts, :actor)
 
     # Find all unpaid cycles for this member
     # We need to check cycle_end for each cycle using its own interval
@@ -850,21 +799,10 @@ defmodule Mv.Membership.Member do
       |> Ash.Query.filter(status == :unpaid)
       |> Ash.Query.load([:membership_fee_type])
 
-    result =
-      if actor do
-        Ash.read(all_unpaid_cycles_query, actor: actor)
-      else
-        Ash.read(all_unpaid_cycles_query)
-      end
-
-    case result do
+    case Ash.read(all_unpaid_cycles_query) do
       {:ok, all_unpaid_cycles} ->
         cycles_to_delete = filter_future_cycles(all_unpaid_cycles, today)
-
-        delete_and_regenerate_cycles(cycles_to_delete, member.id, today,
-          skip_lock?: skip_lock?,
-          actor: actor
-        )
+        delete_and_regenerate_cycles(cycles_to_delete, member.id, today, skip_lock?: skip_lock?)
 
       {:error, reason} ->
         {:error, reason}
@@ -893,14 +831,13 @@ defmodule Mv.Membership.Member do
   # Returns {:ok, notifications} or {:error, reason}
   defp delete_and_regenerate_cycles(cycles_to_delete, member_id, today, opts) do
     skip_lock? = Keyword.get(opts, :skip_lock?, false)
-    actor = Keyword.get(opts, :actor)
 
     if Enum.empty?(cycles_to_delete) do
       # No cycles to delete, just regenerate
-      regenerate_cycles(member_id, today, skip_lock?: skip_lock?, actor: actor)
+      regenerate_cycles(member_id, today, skip_lock?: skip_lock?)
     else
       case delete_cycles(cycles_to_delete) do
-        :ok -> regenerate_cycles(member_id, today, skip_lock?: skip_lock?, actor: actor)
+        :ok -> regenerate_cycles(member_id, today, skip_lock?: skip_lock?)
         {:error, reason} -> {:error, reason}
       end
     end
@@ -926,13 +863,11 @@ defmodule Mv.Membership.Member do
   # Returns {:ok, notifications} - notifications should be returned to after_action hook
   defp regenerate_cycles(member_id, today, opts) do
     skip_lock? = Keyword.get(opts, :skip_lock?, false)
-    actor = Keyword.get(opts, :actor)
 
     case Mv.MembershipFees.CycleGenerator.generate_cycles_for_member(
            member_id,
            today: today,
-           skip_lock?: skip_lock?,
-           actor: actor
+           skip_lock?: skip_lock?
          ) do
       {:ok, _cycles, notifications} when is_list(notifications) ->
         {:ok, notifications}
@@ -946,25 +881,21 @@ defmodule Mv.Membership.Member do
   # based on environment (test vs production)
   # This function encapsulates the common logic for cycle generation
   # to avoid code duplication across different hooks
-  defp handle_cycle_generation(member, opts) do
-    actor = Keyword.get(opts, :actor)
-
+  defp handle_cycle_generation(member) do
     if Mv.Config.sql_sandbox?() do
-      handle_cycle_generation_sync(member, actor: actor)
+      handle_cycle_generation_sync(member)
     else
-      handle_cycle_generation_async(member, actor: actor)
+      handle_cycle_generation_async(member)
     end
   end
 
   # Runs cycle generation synchronously (for test environment)
-  defp handle_cycle_generation_sync(member, opts) do
+  defp handle_cycle_generation_sync(member) do
     require Logger
-    actor = Keyword.get(opts, :actor)
 
     case Mv.MembershipFees.CycleGenerator.generate_cycles_for_member(
            member.id,
-           today: Date.utc_today(),
-           actor: actor
+           today: Date.utc_today()
          ) do
       {:ok, cycles, notifications} ->
         send_notifications_if_any(notifications)
@@ -976,11 +907,9 @@ defmodule Mv.Membership.Member do
   end
 
   # Runs cycle generation asynchronously (for production environment)
-  defp handle_cycle_generation_async(member, opts) do
-    actor = Keyword.get(opts, :actor)
-
+  defp handle_cycle_generation_async(member) do
     Task.Supervisor.async_nolink(Mv.TaskSupervisor, fn ->
-      case Mv.MembershipFees.CycleGenerator.generate_cycles_for_member(member.id, actor: actor) do
+      case Mv.MembershipFees.CycleGenerator.generate_cycles_for_member(member.id) do
         {:ok, cycles, notifications} ->
           send_notifications_if_any(notifications)
           log_cycle_generation_success(member, cycles, notifications, sync: false)
@@ -1209,18 +1138,15 @@ defmodule Mv.Membership.Member do
     custom_field_values_arg = Ash.Changeset.get_argument(changeset, :custom_field_values)
 
     if is_nil(custom_field_values_arg) do
-      extract_existing_values(changeset.data, changeset)
+      extract_existing_values(changeset.data)
     else
       extract_argument_values(custom_field_values_arg)
     end
   end
 
   # Extracts custom field values from existing member data (update scenario)
-  defp extract_existing_values(member_data, changeset) do
-    actor = Map.get(changeset.context, :actor)
-    opts = Helpers.ash_actor_opts(actor)
-
-    case Ash.load(member_data, :custom_field_values, opts) do
+  defp extract_existing_values(member_data) do
+    case Ash.load(member_data, :custom_field_values) do
       {:ok, %{custom_field_values: existing_values}} ->
         Enum.reduce(existing_values, %{}, &extract_value_from_cfv/2)
 
diff --git a/lib/mv/authorization/checks/has_permission.ex b/lib/mv/authorization/checks/has_permission.ex
index 18ffe5b..345d6e4 100644
--- a/lib/mv/authorization/checks/has_permission.ex
+++ b/lib/mv/authorization/checks/has_permission.ex
@@ -21,8 +21,8 @@ defmodule Mv.Authorization.Checks.HasPermission do
   - **:all** - Authorizes without filtering (returns all records)
   - **:own** - Filters to records where record.id == actor.id
   - **:linked** - Filters based on resource type:
-    - Member: `id == actor.member_id` (User.member_id → Member.id, inverse relationship)
-    - CustomFieldValue: `member_id == actor.member_id` (CustomFieldValue.member_id → Member.id → User.member_id)
+    - Member: member.user.id == actor.id (via has_one :user relationship)
+    - CustomFieldValue: custom_field_value.member.user.id == actor.id (traverses member → user relationship!)
 
   ## Error Handling
 
@@ -59,7 +59,6 @@ defmodule Mv.Authorization.Checks.HasPermission do
   def strict_check(actor, authorizer, _opts) do
     resource = authorizer.resource
     action = get_action_from_authorizer(authorizer)
-    record = get_record_from_authorizer(authorizer)
 
     cond do
       is_nil(actor) ->
@@ -77,12 +76,12 @@ defmodule Mv.Authorization.Checks.HasPermission do
         {:ok, false}
 
       true ->
-        strict_check_with_permissions(actor, resource, action, record)
+        strict_check_with_permissions(actor, resource, action)
     end
   end
 
   # Helper function to reduce nesting depth
-  defp strict_check_with_permissions(actor, resource, action, record) do
+  defp strict_check_with_permissions(actor, resource, action) do
     with %{role: %{permission_set_name: ps_name}} when not is_nil(ps_name) <- actor,
          {:ok, ps_atom} <- PermissionSets.permission_set_name_to_atom(ps_name),
          permissions <- PermissionSets.get_permissions(ps_atom),
@@ -94,15 +93,9 @@ defmodule Mv.Authorization.Checks.HasPermission do
              actor,
              resource_name
            ) do
-        :authorized ->
-          {:ok, true}
-
-        {:filter, filter_expr} ->
-          # For strict_check on single records, evaluate the filter against the record
-          evaluate_filter_for_strict_check(filter_expr, actor, record, resource_name)
-
-        false ->
-          {:ok, false}
+        :authorized -> {:ok, true}
+        {:filter, _} -> {:ok, :unknown}
+        false -> {:ok, false}
       end
     else
       %{role: nil} ->
@@ -129,17 +122,9 @@ defmodule Mv.Authorization.Checks.HasPermission do
     action = get_action_from_authorizer(authorizer)
 
     cond do
-      is_nil(actor) ->
-        # No actor - deny access (fail-closed)
-        # Return filter that never matches (expr(false) = match none)
-        deny_filter()
-
-      is_nil(action) ->
-        # Cannot determine action - deny access (fail-closed)
-        deny_filter()
-
-      true ->
-        auto_filter_with_permissions(actor, resource, action)
+      is_nil(actor) -> nil
+      is_nil(action) -> nil
+      true -> auto_filter_with_permissions(actor, resource, action)
     end
   end
 
@@ -156,97 +141,21 @@ defmodule Mv.Authorization.Checks.HasPermission do
              actor,
              resource_name
            ) do
-        :authorized ->
-          # :all scope - allow all records (no filter)
-          # Return empty keyword list (no filtering)
-          []
-
-        {:filter, filter_expr} ->
-          # :linked or :own scope - apply filter
-          # filter_expr is a keyword list from expr(...), return it directly
-          filter_expr
-
-        false ->
-          # No permission - deny access (fail-closed)
-          deny_filter()
+        :authorized -> nil
+        {:filter, filter_expr} -> filter_expr
+        false -> nil
       end
     else
-      _ ->
-        # Error case (no role, invalid permission set, etc.) - deny access (fail-closed)
-        deny_filter()
-    end
-  end
-
-  # Helper function to return a filter that never matches (deny all records)
-  # Used when authorization should be denied (fail-closed)
-  #
-  # Using `expr(false)` avoids depending on the primary key being named `:id`.
-  # This is more robust than [id: {:in, []}] which assumes the primary key is `:id`.
-  defp deny_filter do
-    expr(false)
-  end
-
-  # Helper to extract action type from authorizer
-  # CRITICAL: Must use action_type, not action.name!
-  # Action types: :create, :read, :update, :destroy
-  # Action names: :create_member, :update_member, etc.
-  # PermissionSets uses action types, not action names
-  #
-  # Prefer authorizer.action.type (stable API) over authorizer.subject (varies by context)
-  defp get_action_from_authorizer(authorizer) do
-    # Primary: Use authorizer.action.type (stable API)
-    case Map.get(authorizer, :action) do
-      %{type: action_type} when action_type in [:create, :read, :update, :destroy] ->
-        action_type
-
-      _ ->
-        # Fallback: Try authorizer.subject (for compatibility with different Ash versions/contexts)
-        case Map.get(authorizer, :subject) do
-          %{action_type: action_type} when action_type in [:create, :read, :update, :destroy] ->
-            action_type
-
-          %{action: %{type: action_type}}
-          when action_type in [:create, :read, :update, :destroy] ->
-            action_type
-
-          _ ->
-            nil
-        end
-    end
-  end
-
-  # Helper to extract record from authorizer for strict_check
-  defp get_record_from_authorizer(authorizer) do
-    case authorizer.subject do
-      %{data: data} when not is_nil(data) -> data
       _ -> nil
     end
   end
 
-  # Evaluate filter expression for strict_check on single records
-  # For :linked scope with Member resource: id == actor.member_id
-  defp evaluate_filter_for_strict_check(_filter_expr, actor, record, resource_name) do
-    case {resource_name, record} do
-      {"Member", %{id: member_id}} when not is_nil(member_id) ->
-        # Check if this member's ID matches the actor's member_id
-        if member_id == actor.member_id do
-          {:ok, true}
-        else
-          {:ok, false}
-        end
-
-      {"CustomFieldValue", %{member_id: cfv_member_id}} when not is_nil(cfv_member_id) ->
-        # Check if this CFV's member_id matches the actor's member_id
-        if cfv_member_id == actor.member_id do
-          {:ok, true}
-        else
-          {:ok, false}
-        end
-
-      _ ->
-        # For other cases or when record is not available, return :unknown
-        # This will cause Ash to use auto_filter instead
-        {:ok, :unknown}
+  # Helper to extract action from authorizer
+  defp get_action_from_authorizer(authorizer) do
+    case authorizer.subject do
+      %{action: %{name: action}} -> action
+      %{action: action} when is_atom(action) -> action
+      _ -> nil
     end
   end
 
@@ -281,24 +190,21 @@ defmodule Mv.Authorization.Checks.HasPermission do
   end
 
   # Scope: linked - Filter based on user relationship (resource-specific!)
-  # IMPORTANT: Understand the relationship direction!
-  # - User belongs_to :member (User.member_id → Member.id)
-  # - Member has_one :user (inverse, no FK on Member)
+  # Uses Ash relationships: Member has_one :user, CustomFieldValue belongs_to :member
   defp apply_scope(:linked, actor, resource_name) do
     case resource_name do
       "Member" ->
-        # User.member_id → Member.id (inverse relationship)
-        # Filter: member.id == actor.member_id
-        {:filter, expr(id == ^actor.member_id)}
+        # Member has_one :user → filter by user.id == actor.id
+        {:filter, expr(user.id == ^actor.id)}
 
       "CustomFieldValue" ->
-        # CustomFieldValue.member_id → Member.id → User.member_id
-        # Filter: custom_field_value.member_id == actor.member_id
-        {:filter, expr(member_id == ^actor.member_id)}
+        # CustomFieldValue belongs_to :member → member has_one :user
+        # Traverse: custom_field_value.member.user.id == actor.id
+        {:filter, expr(member.user.id == ^actor.id)}
 
       _ ->
-        # Fallback for other resources
-        {:filter, expr(user_id == ^actor.id)}
+        # Fallback for other resources: try user relationship first, then user_id
+        {:filter, expr(user.id == ^actor.id or user_id == ^actor.id)}
     end
   end
 
diff --git a/lib/mv/authorization/checks/no_actor.ex b/lib/mv/authorization/checks/no_actor.ex
deleted file mode 100644
index f5eebb7..0000000
--- a/lib/mv/authorization/checks/no_actor.ex
+++ /dev/null
@@ -1,74 +0,0 @@
-defmodule Mv.Authorization.Checks.NoActor do
-  @moduledoc """
-  Custom Ash Policy Check that allows actions when no actor is present.
-
-  **IMPORTANT:** This check ONLY works in test environment for security reasons.
-  In production/dev, ALL operations without an actor are denied.
-
-  ## Security Note
-
-  This check uses compile-time environment detection to prevent accidental
-  security issues in production. In production, ALL operations (including :create
-  and :read) will be denied if no actor is present.
-
-  For seeds and system operations in production, use an admin actor instead:
-
-      admin_user = get_admin_user()
-      Ash.create!(resource, attrs, actor: admin_user)
-
-  ## Usage in Policies
-
-      policies do
-        # Allow system operations without actor (TEST ENVIRONMENT ONLY)
-        # In test: All operations allowed
-        # In production: ALL operations denied (fail-closed)
-        bypass action_type([:create, :read, :update, :destroy]) do
-          authorize_if NoActor
-        end
-        
-        # Check permissions when actor is present
-        policy action_type([:read, :create, :update, :destroy]) do
-          authorize_if HasPermission
-        end
-      end
-
-  ## Behavior
-
-  - In test environment: Returns `true` when actor is nil (allows all operations)
-  - In production/dev: Returns `false` when actor is nil (denies all operations - fail-closed)
-  - Returns `false` when actor is present (delegates to other policies)
-  """
-
-  use Ash.Policy.SimpleCheck
-
-  # Compile-time check: Only allow no-actor bypass in test environment
-  @allow_no_actor_bypass Mix.env() == :test
-  # Alternative (if you want to control via config):
-  # @allow_no_actor_bypass Application.compile_env(:mv, :allow_no_actor_bypass, false)
-
-  @impl true
-  def describe(_opts) do
-    if @allow_no_actor_bypass do
-      "allows actions when no actor is present (test environment only)"
-    else
-      "denies all actions when no actor is present (production/dev - fail-closed)"
-    end
-  end
-
-  @impl true
-  def match?(nil, _context, _opts) do
-    # Actor is nil
-    if @allow_no_actor_bypass do
-      # Test environment: Allow all operations
-      true
-    else
-      # Production/dev: Deny all operations (fail-closed for security)
-      false
-    end
-  end
-
-  def match?(_actor, _context, _opts) do
-    # Actor is present - don't match (let other policies decide)
-    false
-  end
-end
diff --git a/lib/mv/email_sync/changes/sync_member_email_to_user.ex b/lib/mv/email_sync/changes/sync_member_email_to_user.ex
index 0c0d8f7..48c7955 100644
--- a/lib/mv/email_sync/changes/sync_member_email_to_user.ex
+++ b/lib/mv/email_sync/changes/sync_member_email_to_user.ex
@@ -41,10 +41,8 @@ defmodule Mv.EmailSync.Changes.SyncMemberEmailToUser do
     Ash.Changeset.around_transaction(changeset, fn cs, callback ->
       result = callback.(cs)
 
-      actor = Map.get(changeset.context, :actor)
-
       with {:ok, member} <- Helpers.extract_record(result),
-           linked_user <- Loader.get_linked_user(member, actor) do
+           linked_user <- Loader.get_linked_user(member) do
         Helpers.sync_email_to_linked_record(result, linked_user, new_email)
       else
         _ -> result
diff --git a/lib/mv/email_sync/changes/sync_user_email_to_member.ex b/lib/mv/email_sync/changes/sync_user_email_to_member.ex
index 54829a4..7148067 100644
--- a/lib/mv/email_sync/changes/sync_user_email_to_member.ex
+++ b/lib/mv/email_sync/changes/sync_user_email_to_member.ex
@@ -33,17 +33,7 @@ defmodule Mv.EmailSync.Changes.SyncUserEmailToMember do
     if Map.get(context, :syncing_email, false) do
       changeset
     else
-      # Ensure actor is in changeset context - get it from context if available
-      actor = Map.get(changeset.context, :actor) || Map.get(context, :actor)
-
-      changeset_with_actor =
-        if actor && !Map.has_key?(changeset.context, :actor) do
-          Ash.Changeset.put_context(changeset, :actor, actor)
-        else
-          changeset
-        end
-
-      sync_email(changeset_with_actor)
+      sync_email(changeset)
     end
   end
 
@@ -52,7 +42,7 @@ defmodule Mv.EmailSync.Changes.SyncUserEmailToMember do
       result = callback.(cs)
 
       with {:ok, record} <- Helpers.extract_record(result),
-           {:ok, user, member} <- get_user_and_member(record, cs) do
+           {:ok, user, member} <- get_user_and_member(record) do
         # When called from Member-side, we need to update the member in the result
         # When called from User-side, we update the linked member in DB only
         case record do
@@ -71,19 +61,15 @@ defmodule Mv.EmailSync.Changes.SyncUserEmailToMember do
   end
 
   # Retrieves user and member - works for both resource types
-  defp get_user_and_member(%Mv.Accounts.User{} = user, changeset) do
-    actor = Map.get(changeset.context, :actor)
-
-    case Loader.get_linked_member(user, actor) do
+  defp get_user_and_member(%Mv.Accounts.User{} = user) do
+    case Loader.get_linked_member(user) do
       nil -> {:error, :no_member}
       member -> {:ok, user, member}
     end
   end
 
-  defp get_user_and_member(%Mv.Membership.Member{} = member, changeset) do
-    actor = Map.get(changeset.context, :actor)
-
-    case Loader.load_linked_user!(member, actor) do
+  defp get_user_and_member(%Mv.Membership.Member{} = member) do
+    case Loader.load_linked_user!(member) do
       {:ok, user} -> {:ok, user, member}
       error -> error
     end
diff --git a/lib/mv/email_sync/loader.ex b/lib/mv/email_sync/loader.ex
index 91927fb..ecb1038 100644
--- a/lib/mv/email_sync/loader.ex
+++ b/lib/mv/email_sync/loader.ex
@@ -2,30 +2,15 @@ defmodule Mv.EmailSync.Loader do
   @moduledoc """
   Helper functions for loading linked records in email synchronization.
   Centralizes the logic for retrieving related User/Member entities.
-
-  ## Authorization
-
-  This module runs systemically and accepts optional actor parameters.
-  When called from hooks/changes, actor is extracted from changeset context.
-  When called directly, actor should be provided for proper authorization.
-
-  All functions accept an optional `actor` parameter that is passed to Ash operations
-  to ensure proper authorization checks are performed.
   """
-  alias Mv.Helpers
 
   @doc """
   Loads the member linked to a user, returns nil if not linked or on error.
-
-  Accepts optional actor for authorization.
   """
-  def get_linked_member(user, actor \\ nil)
-  def get_linked_member(%{member_id: nil}, _actor), do: nil
+  def get_linked_member(%{member_id: nil}), do: nil
 
-  def get_linked_member(%{member_id: id}, actor) do
-    opts = Helpers.ash_actor_opts(actor)
-
-    case Ash.get(Mv.Membership.Member, id, opts) do
+  def get_linked_member(%{member_id: id}) do
+    case Ash.get(Mv.Membership.Member, id) do
       {:ok, member} -> member
       {:error, _} -> nil
     end
@@ -33,13 +18,9 @@ defmodule Mv.EmailSync.Loader do
 
   @doc """
   Loads the user linked to a member, returns nil if not linked or on error.
-
-  Accepts optional actor for authorization.
   """
-  def get_linked_user(member, actor \\ nil) do
-    opts = Helpers.ash_actor_opts(actor)
-
-    case Ash.load(member, :user, opts) do
+  def get_linked_user(member) do
+    case Ash.load(member, :user) do
       {:ok, %{user: user}} -> user
       {:error, _} -> nil
     end
@@ -48,13 +29,9 @@ defmodule Mv.EmailSync.Loader do
   @doc """
   Loads the user linked to a member, returning an error tuple if not linked.
   Useful when a link is required for the operation.
-
-  Accepts optional actor for authorization.
   """
-  def load_linked_user!(member, actor \\ nil) do
-    opts = Helpers.ash_actor_opts(actor)
-
-    case Ash.load(member, :user, opts) do
+  def load_linked_user!(member) do
+    case Ash.load(member, :user) do
       {:ok, %{user: user}} when not is_nil(user) -> {:ok, user}
       {:ok, _} -> {:error, :no_linked_user}
       {:error, _} = error -> error
diff --git a/lib/mv/helpers.ex b/lib/mv/helpers.ex
deleted file mode 100644
index e20db67..0000000
--- a/lib/mv/helpers.ex
+++ /dev/null
@@ -1,27 +0,0 @@
-defmodule Mv.Helpers do
-  @moduledoc """
-  Shared helper functions used across the Mv application.
-
-  Provides utilities that are not specific to a single domain or layer.
-  """
-
-  @doc """
-  Converts an actor to Ash options list for authorization.
-  Returns empty list if actor is nil.
-
-  This helper ensures consistent actor handling across all Ash operations
-  in the application, whether called from LiveViews, changes, validations,
-  or other contexts.
-
-  ## Examples
-
-      opts = ash_actor_opts(actor)
-      Ash.read(query, opts)
-
-      opts = ash_actor_opts(nil)
-      # => []
-  """
-  @spec ash_actor_opts(Mv.Accounts.User.t() | nil) :: keyword()
-  def ash_actor_opts(nil), do: []
-  def ash_actor_opts(actor) when not is_nil(actor), do: [actor: actor]
-end
diff --git a/lib/mv/membership/member/validations/email_not_used_by_other_user.ex b/lib/mv/membership/member/validations/email_not_used_by_other_user.ex
index e1bbc4e..a14bc0b 100644
--- a/lib/mv/membership/member/validations/email_not_used_by_other_user.ex
+++ b/lib/mv/membership/member/validations/email_not_used_by_other_user.ex
@@ -8,7 +8,6 @@ defmodule Mv.Membership.Member.Validations.EmailNotUsedByOtherUser do
   This allows creating members with the same email as unlinked users.
   """
   use Ash.Resource.Validation
-  alias Mv.Helpers
 
   @doc """
   Validates email uniqueness across linked Member-User pairs.
@@ -30,8 +29,7 @@ defmodule Mv.Membership.Member.Validations.EmailNotUsedByOtherUser do
   def validate(changeset, _opts, _context) do
     email_changing? = Ash.Changeset.changing_attribute?(changeset, :email)
 
-    actor = Map.get(changeset.context || %{}, :actor)
-    linked_user_id = get_linked_user_id(changeset.data, actor)
+    linked_user_id = get_linked_user_id(changeset.data)
     is_linked? = not is_nil(linked_user_id)
 
     # Only validate if member is already linked AND email is changing
@@ -40,21 +38,19 @@ defmodule Mv.Membership.Member.Validations.EmailNotUsedByOtherUser do
 
     if should_validate? do
       new_email = Ash.Changeset.get_attribute(changeset, :email)
-      check_email_uniqueness(new_email, linked_user_id, actor)
+      check_email_uniqueness(new_email, linked_user_id)
     else
       :ok
     end
   end
 
-  defp check_email_uniqueness(email, exclude_user_id, actor) do
+  defp check_email_uniqueness(email, exclude_user_id) do
     query =
       Mv.Accounts.User
       |> Ash.Query.filter(email == ^email)
       |> maybe_exclude_id(exclude_user_id)
 
-    opts = Helpers.ash_actor_opts(actor)
-
-    case Ash.read(query, opts) do
+    case Ash.read(query) do
       {:ok, []} ->
         :ok
 
@@ -69,10 +65,8 @@ defmodule Mv.Membership.Member.Validations.EmailNotUsedByOtherUser do
   defp maybe_exclude_id(query, nil), do: query
   defp maybe_exclude_id(query, id), do: Ash.Query.filter(query, id != ^id)
 
-  defp get_linked_user_id(member_data, actor) do
-    opts = Helpers.ash_actor_opts(actor)
-
-    case Ash.load(member_data, :user, opts) do
+  defp get_linked_user_id(member_data) do
+    case Ash.load(member_data, :user) do
       {:ok, %{user: %{id: id}}} -> id
       _ -> nil
     end
diff --git a/lib/mv/membership_fees/cycle_generator.ex b/lib/mv/membership_fees/cycle_generator.ex
index 0d17dd3..7d6c798 100644
--- a/lib/mv/membership_fees/cycle_generator.ex
+++ b/lib/mv/membership_fees/cycle_generator.ex
@@ -28,15 +28,6 @@ defmodule Mv.MembershipFees.CycleGenerator do
   Uses PostgreSQL advisory locks to prevent race conditions when generating
   cycles for the same member concurrently.
 
-  ## Authorization
-
-  This module runs systemically and accepts optional actor parameters.
-  When called from hooks/changes, actor is extracted from changeset context.
-  When called directly, actor should be provided for proper authorization.
-
-  All functions accept an optional `actor` parameter in the `opts` keyword list
-  that is passed to Ash operations to ensure proper authorization checks are performed.
-
   ## Examples
 
       # Generate cycles for a single member
@@ -86,9 +77,7 @@ defmodule Mv.MembershipFees.CycleGenerator do
   def generate_cycles_for_member(member_or_id, opts \\ [])
 
   def generate_cycles_for_member(member_id, opts) when is_binary(member_id) do
-    actor = Keyword.get(opts, :actor)
-
-    case load_member(member_id, actor: actor) do
+    case load_member(member_id) do
       {:ok, member} -> generate_cycles_for_member(member, opts)
       {:error, reason} -> {:error, reason}
     end
@@ -98,27 +87,25 @@ defmodule Mv.MembershipFees.CycleGenerator do
     today = Keyword.get(opts, :today, Date.utc_today())
     skip_lock? = Keyword.get(opts, :skip_lock?, false)
 
-    do_generate_cycles_with_lock(member, today, skip_lock?, opts)
+    do_generate_cycles_with_lock(member, today, skip_lock?)
   end
 
   # Generate cycles with lock handling
   # Returns {:ok, cycles, notifications} - notifications are never sent here,
   # they should be returned to the caller (e.g., via after_action hook)
-  defp do_generate_cycles_with_lock(member, today, true = _skip_lock?, opts) do
+  defp do_generate_cycles_with_lock(member, today, true = _skip_lock?) do
     # Lock already set by caller (e.g., regenerate_cycles_on_type_change)
     # Just generate cycles without additional locking
-    actor = Keyword.get(opts, :actor)
-    do_generate_cycles(member, today, actor: actor)
+    do_generate_cycles(member, today)
   end
 
-  defp do_generate_cycles_with_lock(member, today, false, opts) do
+  defp do_generate_cycles_with_lock(member, today, false) do
     lock_key = :erlang.phash2(member.id)
-    actor = Keyword.get(opts, :actor)
 
     Repo.transaction(fn ->
       Ecto.Adapters.SQL.query!(Repo, "SELECT pg_advisory_xact_lock($1)", [lock_key])
 
-      case do_generate_cycles(member, today, actor: actor) do
+      case do_generate_cycles(member, today) do
         {:ok, cycles, notifications} ->
           # Return cycles and notifications - do NOT send notifications here
           # They will be sent by the caller (e.g., via after_action hook)
@@ -235,33 +222,21 @@ defmodule Mv.MembershipFees.CycleGenerator do
 
   # Private functions
 
-  defp load_member(member_id, opts) do
-    actor = Keyword.get(opts, :actor)
-
-    query =
-      Member
-      |> Ash.Query.filter(id == ^member_id)
-      |> Ash.Query.load([:membership_fee_type, :membership_fee_cycles])
-
-    result =
-      if actor do
-        Ash.read_one(query, actor: actor)
-      else
-        Ash.read_one(query)
-      end
-
-    case result do
+  defp load_member(member_id) do
+    Member
+    |> Ash.Query.filter(id == ^member_id)
+    |> Ash.Query.load([:membership_fee_type, :membership_fee_cycles])
+    |> Ash.read_one()
+    |> case do
       {:ok, nil} -> {:error, :member_not_found}
       {:ok, member} -> {:ok, member}
       {:error, reason} -> {:error, reason}
     end
   end
 
-  defp do_generate_cycles(member, today, opts) do
-    actor = Keyword.get(opts, :actor)
-
+  defp do_generate_cycles(member, today) do
     # Reload member with relationships to ensure fresh data
-    case load_member(member.id, actor: actor) do
+    case load_member(member.id) do
       {:ok, member} ->
         cond do
           is_nil(member.membership_fee_type_id) ->
@@ -271,7 +246,7 @@ defmodule Mv.MembershipFees.CycleGenerator do
             {:error, :no_join_date}
 
           true ->
-            generate_missing_cycles(member, today, actor: actor)
+            generate_missing_cycles(member, today)
         end
 
       {:error, reason} ->
@@ -279,8 +254,7 @@ defmodule Mv.MembershipFees.CycleGenerator do
     end
   end
 
-  defp generate_missing_cycles(member, today, opts) do
-    actor = Keyword.get(opts, :actor)
+  defp generate_missing_cycles(member, today) do
     fee_type = member.membership_fee_type
     interval = fee_type.interval
     amount = fee_type.amount
@@ -296,7 +270,7 @@ defmodule Mv.MembershipFees.CycleGenerator do
     # Only generate if start_date <= end_date
     if start_date && Date.compare(start_date, end_date) != :gt do
       cycle_starts = generate_cycle_starts(start_date, end_date, interval)
-      create_cycles(cycle_starts, member.id, fee_type.id, amount, actor: actor)
+      create_cycles(cycle_starts, member.id, fee_type.id, amount)
     else
       {:ok, [], []}
     end
@@ -391,8 +365,7 @@ defmodule Mv.MembershipFees.CycleGenerator do
     end
   end
 
-  defp create_cycles(cycle_starts, member_id, fee_type_id, amount, opts) do
-    actor = Keyword.get(opts, :actor)
+  defp create_cycles(cycle_starts, member_id, fee_type_id, amount) do
     # Always use return_notifications?: true to collect notifications
     # Notifications will be returned to the caller, who is responsible for
     # sending them (e.g., via after_action hook returning {:ok, result, notifications})
@@ -407,7 +380,7 @@ defmodule Mv.MembershipFees.CycleGenerator do
         }
 
         handle_cycle_creation_result(
-          Ash.create(MembershipFeeCycle, attrs, return_notifications?: true, actor: actor),
+          Ash.create(MembershipFeeCycle, attrs, return_notifications?: true),
           cycle_start
         )
       end)
diff --git a/lib/mv_web.ex b/lib/mv_web.ex
index 08a3c23..8589be1 100644
--- a/lib/mv_web.ex
+++ b/lib/mv_web.ex
@@ -17,7 +17,7 @@ defmodule MvWeb do
   those modules here.
   """
 
-  def static_paths, do: ~w(assets fonts images favicon.ico robots.txt templates)
+  def static_paths, do: ~w(assets fonts images favicon.ico robots.txt)
 
   def router do
     quote do
diff --git a/lib/mv_web/live/custom_field_live/form_component.ex b/lib/mv_web/live/custom_field_live/form_component.ex
index 54ef4a7..71bdd03 100644
--- a/lib/mv_web/live/custom_field_live/form_component.ex
+++ b/lib/mv_web/live/custom_field_live/form_component.ex
@@ -91,9 +91,7 @@ defmodule MvWeb.CustomFieldLive.FormComponent do
 
   @impl true
   def handle_event("save", %{"custom_field" => custom_field_params}, socket) do
-    actor = MvWeb.LiveHelpers.current_actor(socket)
-
-    case MvWeb.LiveHelpers.submit_form(socket.assigns.form, custom_field_params, actor) do
+    case AshPhoenix.Form.submit(socket.assigns.form, params: custom_field_params) do
       {:ok, custom_field} ->
         action =
           case socket.assigns.form.source.type do
diff --git a/lib/mv_web/live/custom_field_value_live/form.ex b/lib/mv_web/live/custom_field_value_live/form.ex
index 599ce1d..4db2bed 100644
--- a/lib/mv_web/live/custom_field_value_live/form.ex
+++ b/lib/mv_web/live/custom_field_value_live/form.ex
@@ -32,9 +32,6 @@ defmodule MvWeb.CustomFieldValueLive.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
   def render(assigns) do
     ~H"""
@@ -175,9 +172,8 @@ defmodule MvWeb.CustomFieldValueLive.Form do
     page_title = action <> " " <> "Custom field value"
 
     # Load all CustomFields and Members for the selection fields
-    actor = current_actor(socket)
-    custom_fields = Ash.read!(Mv.Membership.CustomField, actor: actor)
-    members = Ash.read!(Mv.Membership.Member, actor: actor)
+    custom_fields = Ash.read!(Mv.Membership.CustomField)
+    members = Ash.read!(Mv.Membership.Member)
 
     {:ok,
      socket
@@ -228,9 +224,7 @@ defmodule MvWeb.CustomFieldValueLive.Form do
         custom_field_value_params
       end
 
-    actor = current_actor(socket)
-
-    case submit_form(socket.assigns.form, updated_params, actor) do
+    case AshPhoenix.Form.submit(socket.assigns.form, params: updated_params) do
       {:ok, custom_field_value} ->
         notify_parent({:saved, custom_field_value})
 
diff --git a/lib/mv_web/live/custom_field_value_live/index.ex b/lib/mv_web/live/custom_field_value_live/index.ex
index eea578e..b52fd96 100644
--- a/lib/mv_web/live/custom_field_value_live/index.ex
+++ b/lib/mv_web/live/custom_field_value_live/index.ex
@@ -23,9 +23,6 @@ defmodule MvWeb.CustomFieldValueLive.Index do
   """
   use MvWeb, :live_view
 
-  on_mount {MvWeb.LiveHelpers, :ensure_user_role_loaded}
-  import MvWeb.LiveHelpers, only: [current_actor: 1]
-
   @impl true
   def render(assigns) do
     ~H"""
@@ -73,85 +70,17 @@ defmodule MvWeb.CustomFieldValueLive.Index do
 
   @impl true
   def mount(_params, _session, socket) do
-    actor = current_actor(socket)
-
-    # Early return if no actor (prevents exceptions in unauthenticated tests)
-    if is_nil(actor) do
-      {:ok,
-       socket
-       |> assign(:page_title, "Listing Custom field values")
-       |> stream(:custom_field_values, [])}
-    else
-      case Ash.read(Mv.Membership.CustomFieldValue, actor: actor) do
-        {:ok, custom_field_values} ->
-          {:ok,
-           socket
-           |> assign(:page_title, "Listing Custom field values")
-           |> stream(:custom_field_values, custom_field_values)}
-
-        {:error, %Ash.Error.Forbidden{}} ->
-          {:ok,
-           socket
-           |> assign(:page_title, "Listing Custom field values")
-           |> stream(:custom_field_values, [])
-           |> put_flash(:error, gettext("You do not have permission to view custom field values"))}
-
-        {:error, error} ->
-          {:ok,
-           socket
-           |> assign(:page_title, "Listing Custom field values")
-           |> stream(:custom_field_values, [])
-           |> put_flash(:error, format_error(error))}
-      end
-    end
+    {:ok,
+     socket
+     |> assign(:page_title, "Listing Custom field values")
+     |> stream(:custom_field_values, Ash.read!(Mv.Membership.CustomFieldValue))}
   end
 
   @impl true
   def handle_event("delete", %{"id" => id}, socket) do
-    actor = MvWeb.LiveHelpers.current_actor(socket)
+    custom_field_value = Ash.get!(Mv.Membership.CustomFieldValue, id)
+    Ash.destroy!(custom_field_value)
 
-    case Ash.get(Mv.Membership.CustomFieldValue, id, actor: actor) do
-      {:ok, custom_field_value} ->
-        case Ash.destroy(custom_field_value, actor: actor) do
-          :ok ->
-            {:noreply,
-             socket
-             |> stream_delete(:custom_field_values, custom_field_value)
-             |> put_flash(:info, gettext("Custom field value deleted successfully"))}
-
-          {:error, %Ash.Error.Forbidden{}} ->
-            {:noreply,
-             put_flash(
-               socket,
-               :error,
-               gettext("You do not have permission to delete this custom field value")
-             )}
-
-          {:error, error} ->
-            {:noreply, put_flash(socket, :error, format_error(error))}
-        end
-
-      {:error, %Ash.Error.Query.NotFound{}} ->
-        {:noreply, put_flash(socket, :error, gettext("Custom field value not found"))}
-
-      {:error, %Ash.Error.Forbidden{} = _error} ->
-        {:noreply,
-         put_flash(
-           socket,
-           :error,
-           gettext("You do not have permission to access this custom field value")
-         )}
-
-      {:error, error} ->
-        {:noreply, put_flash(socket, :error, format_error(error))}
-    end
-  end
-
-  defp format_error(%Ash.Error.Invalid{errors: errors}) do
-    Enum.map_join(errors, ", ", fn %{message: message} -> message end)
-  end
-
-  defp format_error(error) do
-    inspect(error)
+    {:noreply, stream_delete(socket, :custom_field_values, custom_field_value)}
   end
 end
diff --git a/lib/mv_web/live/global_settings_live.ex b/lib/mv_web/live/global_settings_live.ex
index 97fd81e..a4332d3 100644
--- a/lib/mv_web/live/global_settings_live.ex
+++ b/lib/mv_web/live/global_settings_live.ex
@@ -90,9 +90,7 @@ defmodule MvWeb.GlobalSettingsLive do
 
   @impl true
   def handle_event("save", %{"setting" => setting_params}, socket) do
-    actor = MvWeb.LiveHelpers.current_actor(socket)
-
-    case MvWeb.LiveHelpers.submit_form(socket.assigns.form, setting_params, actor) do
+    case AshPhoenix.Form.submit(socket.assigns.form, params: setting_params) do
       {:ok, _updated_settings} ->
         # Reload settings from database to ensure all dependent data is updated
         {:ok, fresh_settings} = Membership.get_settings()
diff --git a/lib/mv_web/live/member_live/form.ex b/lib/mv_web/live/member_live/form.ex
index 3c68b21..0a05e1f 100644
--- a/lib/mv_web/live/member_live/form.ex
+++ b/lib/mv_web/live/member_live/form.ex
@@ -21,10 +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
   alias Mv.MembershipFees.MembershipFeeType
   alias MvWeb.Helpers.MembershipFeeHelpers
@@ -176,7 +172,7 @@ defmodule MvWeb.MemberLive.Form do
                 <select
                   class="select select-bordered w-full"
                   name={@form[:membership_fee_type_id].name}
-                  phx-change="validate"
+                  phx-change="validate_membership_fee_type"
                   value={@form[:membership_fee_type_id].value || ""}
                 >
                   <option value="">{gettext("None")}</option>
@@ -226,8 +222,6 @@ defmodule MvWeb.MemberLive.Form do
 
   @impl true
   def mount(params, _session, socket) do
-    # current_user should be set by on_mount hooks (LiveUserAuth + LiveHelpers)
-    actor = current_actor(socket)
     {:ok, custom_fields} = Mv.Membership.list_custom_fields()
 
     initial_custom_field_values =
@@ -245,14 +239,14 @@ defmodule MvWeb.MemberLive.Form do
     member =
       case params["id"] do
         nil -> nil
-        id -> Ash.get!(Mv.Membership.Member, id, load: [:membership_fee_type], actor: actor)
+        id -> Ash.get!(Mv.Membership.Member, id, load: [:membership_fee_type])
       end
 
     page_title =
       if is_nil(member), do: gettext("Create Member"), else: gettext("Edit Member")
 
     # Load available membership fee types
-    available_fee_types = load_available_fee_types(member, actor)
+    available_fee_types = load_available_fee_types(member)
 
     {:ok,
      socket
@@ -271,80 +265,53 @@ defmodule MvWeb.MemberLive.Form do
 
   @impl true
   def handle_event("validate", %{"member" => member_params}, socket) do
-    # Merge with existing form values to preserve unchanged fields (especially custom_field_values)
-    # Extract values directly from form fields to get current state
-    existing_values = get_existing_form_values(socket.assigns.form)
-
-    # Merge existing values with new params (new params take precedence)
-    merged_params = Map.merge(existing_values, member_params)
-
-    validated_form = AshPhoenix.Form.validate(socket.assigns.form, merged_params)
+    validated_form = AshPhoenix.Form.validate(socket.assigns.form, member_params)
 
     # Check for interval mismatch if membership_fee_type_id changed
-    socket = check_interval_change(socket, merged_params)
+    socket = check_interval_change(socket, member_params)
 
     {:noreply, assign(socket, form: validated_form)}
   end
 
+  def handle_event(
+        "validate_membership_fee_type",
+        %{"member" => %{"membership_fee_type_id" => fee_type_id}},
+        socket
+      ) do
+    # Same validation as above, but triggered by select change
+    handle_event("validate", %{"member" => %{"membership_fee_type_id" => fee_type_id}}, socket)
+  end
+
   def handle_event("save", %{"member" => member_params}, socket) do
-    try do
-      actor = current_actor(socket)
+    case AshPhoenix.Form.submit(socket.assigns.form, params: member_params) do
+      {:ok, member} ->
+        notify_parent({:saved, member})
 
-      case submit_form(socket.assigns.form, member_params, actor) do
-        {:ok, member} ->
-          handle_save_success(socket, member)
+        action =
+          case socket.assigns.form.source.type do
+            :create -> gettext("create")
+            :update -> gettext("update")
+            other -> to_string(other)
+          end
 
-        {:error, form} ->
-          {:noreply, assign(socket, form: form)}
-      end
-    rescue
-      _e in [Ash.Error.Forbidden, Ash.Error.Forbidden.Policy] ->
-        handle_save_forbidden(socket)
+        socket =
+          socket
+          |> put_flash(:info, gettext("Member %{action} successfully", action: action))
+          |> push_navigate(to: return_path(socket.assigns.return_to, member))
+
+        {:noreply, socket}
+
+      {:error, form} ->
+        {:noreply, assign(socket, form: form)}
     end
   end
 
-  defp handle_save_success(socket, member) do
-    notify_parent({:saved, member})
-
-    flash_message =
-      case socket.assigns.form.source.type do
-        :create -> gettext("Member created successfully")
-        :update -> gettext("Member updated successfully")
-        other -> gettext("Member %{action} successfully", action: get_action_name(other))
-      end
-
-    socket =
-      socket
-      |> put_flash(:info, flash_message)
-      |> push_navigate(to: return_path(socket.assigns.return_to, member))
-
-    {:noreply, socket}
-  end
-
-  defp handle_save_forbidden(socket) do
-    # Handle policy violations that aren't properly displayed in forms
-    # AshPhoenix.Form doesn't implement FormData.Error protocol for Forbidden errors
-    action = get_action_name(socket.assigns.form.source.type)
-
-    error_message =
-      gettext("You do not have permission to %{action} members.", action: action)
-
-    {:noreply, put_flash(socket, :error, error_message)}
-  end
-
-  defp get_action_name(:create), do: gettext("create")
-  defp get_action_name(:update), do: gettext("update")
-  defp get_action_name(other), do: to_string(other)
-
   defp notify_parent(msg), do: send(self(), {__MODULE__, msg})
 
-  defp assign_form(%{assigns: assigns} = socket) do
-    member = assigns.member
-    actor = assigns[:current_user] || assigns.current_user
-
+  defp assign_form(%{assigns: %{member: member}} = socket) do
     form =
       if member do
-        {:ok, member} = Ash.load(member, [custom_field_values: [:custom_field]], actor: actor)
+        {:ok, member} = Ash.load(member, custom_field_values: [:custom_field])
 
         existing_custom_field_values =
           member.custom_field_values
@@ -375,8 +342,7 @@ defmodule MvWeb.MemberLive.Form do
             api: Mv.Membership,
             as: "member",
             params: params,
-            forms: [auto?: true],
-            actor: actor
+            forms: [auto?: true]
           )
 
         missing_custom_field_values =
@@ -394,8 +360,7 @@ defmodule MvWeb.MemberLive.Form do
           api: Mv.Membership,
           as: "member",
           params: %{"custom_field_values" => socket.assigns[:initial_custom_field_values]},
-          forms: [auto?: true],
-          actor: actor
+          forms: [auto?: true]
         )
       end
 
@@ -410,11 +375,11 @@ defmodule MvWeb.MemberLive.Form do
   # Helper Functions
   # -----------------------------------------------------------------
 
-  defp load_available_fee_types(member, actor) do
+  defp load_available_fee_types(member) do
     all_types =
       MembershipFeeType
       |> Ash.Query.sort(name: :asc)
-      |> Ash.read!(domain: MembershipFees, actor: actor)
+      |> Ash.read!(domain: MembershipFees)
 
     # If member has a fee type, filter to same interval
     if member && member.membership_fee_type do
@@ -488,167 +453,4 @@ defmodule MvWeb.MemberLive.Form do
   defp custom_field_input_type(:date), do: "date"
   defp custom_field_input_type(:email), do: "email"
   defp custom_field_input_type(_), do: "text"
-
-  # -----------------------------------------------------------------
-  # Helper Functions for Form Value Preservation
-  # -----------------------------------------------------------------
-
-  # Helper to extract existing form values to preserve them when only one field changes
-  # This ensures custom_field_values and other fields are preserved when only the dropdown changes
-  defp get_existing_form_values(form) do
-    %{}
-    |> extract_form_value(form, :first_name, &to_string/1)
-    |> extract_form_value(form, :last_name, &to_string/1)
-    |> extract_form_value(form, :email, &to_string/1)
-    |> extract_form_value(form, :street, &to_string/1)
-    |> extract_form_value(form, :house_number, &to_string/1)
-    |> extract_form_value(form, :postal_code, &to_string/1)
-    |> extract_form_value(form, :city, &to_string/1)
-    |> extract_form_value(form, :join_date, &format_date_value/1)
-    |> extract_form_value(form, :exit_date, &format_date_value/1)
-    |> extract_form_value(form, :notes, &to_string/1)
-    |> extract_form_value(form, :membership_fee_type_id, &to_string/1)
-    |> extract_form_value(form, :membership_fee_start_date, &format_date_value/1)
-    |> extract_custom_field_values(form)
-  end
-
-  # Helper to extract a single form field value
-  defp extract_form_value(acc, form, field, formatter) do
-    if form[field] && form[field].value do
-      Map.put(acc, to_string(field), formatter.(form[field].value))
-    else
-      acc
-    end
-  end
-
-  # Extracts custom field values from the form structure
-  # The form is a Phoenix.HTML.Form with source being AshPhoenix.Form
-  # Custom field values are in form.source.params["custom_field_values"] as a map
-  defp extract_custom_field_values(acc, form) do
-    cfv_params = get_custom_field_values_params(form)
-
-    if map_size(cfv_params) > 0 do
-      custom_field_values = convert_cfv_params_to_list(cfv_params)
-      Map.put(acc, "custom_field_values", custom_field_values)
-    else
-      acc
-    end
-  end
-
-  # Gets custom_field_values from form params
-  defp get_custom_field_values_params(form) do
-    ash_form = form.source
-
-    if ash_form && Map.has_key?(ash_form, :params) && ash_form.params["custom_field_values"] do
-      ash_form.params["custom_field_values"]
-    else
-      %{}
-    end
-  end
-
-  # Converts custom field values map to sorted list
-  defp convert_cfv_params_to_list(cfv_params) do
-    cfv_params
-    |> Map.to_list()
-    |> Enum.sort_by(&parse_numeric_key/1)
-    |> Enum.map(&build_custom_field_value/1)
-  end
-
-  # Parses numeric key for sorting
-  defp parse_numeric_key({key, _}) do
-    case Integer.parse(key) do
-      {num, _} -> num
-      :error -> 999_999
-    end
-  end
-
-  # Builds a custom field value map from params
-  defp build_custom_field_value({_key, cfv_map}) do
-    %{
-      "custom_field_id" => Map.get(cfv_map, "custom_field_id", ""),
-      "value" => extract_custom_field_value_from_map(Map.get(cfv_map, "value", %{}))
-    }
-  end
-
-  # Extracts the value map structure from a custom field value
-  # Handles both map format and Ash.Union struct format
-  defp extract_custom_field_value_from_map(%Ash.Union{} = union) do
-    union_type = Atom.to_string(union.type)
-
-    %{
-      "_union_type" => union_type,
-      "type" => union_type,
-      "value" => format_custom_field_value(union.value)
-    }
-  end
-
-  defp extract_custom_field_value_from_map(value_map) when is_map(value_map) do
-    union_type = extract_union_type_from_map(value_map)
-    value = Map.get(value_map, "value") || Map.get(value_map, :value)
-
-    %{
-      "_union_type" => union_type,
-      "type" => union_type,
-      "value" => format_custom_field_value(value)
-    }
-  end
-
-  defp extract_custom_field_value_from_map(_),
-    do: %{"_union_type" => "", "type" => "", "value" => ""}
-
-  # Extracts union type from map, checking various possible locations
-  defp extract_union_type_from_map(value_map) do
-    cond do
-      has_non_empty_string(value_map, "_union_type") ->
-        Map.get(value_map, "_union_type")
-
-      has_non_empty_atom(value_map, :_union_type) ->
-        to_string(Map.get(value_map, :_union_type))
-
-      has_atom_type(value_map) ->
-        Atom.to_string(Map.get(value_map, :type))
-
-      has_string_type(value_map) ->
-        Map.get(value_map, "type")
-
-      true ->
-        ""
-    end
-  end
-
-  # Helper to check if map has non-empty string value
-  defp has_non_empty_string(map, key) do
-    value = Map.get(map, key)
-    value && value != ""
-  end
-
-  # Helper to check if map has non-empty atom value
-  defp has_non_empty_atom(map, key) do
-    value = Map.get(map, key)
-    value && value != ""
-  end
-
-  # Helper to check if map has atom type
-  defp has_atom_type(map) do
-    value = Map.get(map, :type)
-    value && is_atom(value)
-  end
-
-  # Helper to check if map has string type
-  defp has_string_type(map) do
-    value = Map.get(map, "type")
-    value && is_binary(value)
-  end
-
-  # Formats custom field value based on its type
-  defp format_custom_field_value(%Date{} = date), do: Date.to_iso8601(date)
-  defp format_custom_field_value(%Decimal{} = decimal), do: Decimal.to_string(decimal, :normal)
-  defp format_custom_field_value(value) when is_boolean(value), do: to_string(value)
-  defp format_custom_field_value(value) when is_binary(value), do: value
-  defp format_custom_field_value(value), do: to_string(value)
-
-  # Formats date value (Date or string) to string
-  defp format_date_value(%Date{} = date), do: Date.to_iso8601(date)
-  defp format_date_value(value) when is_binary(value), do: value
-  defp format_date_value(_), do: ""
 end
diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex
index f63407a..34928cd 100644
--- a/lib/mv_web/live/member_live/index.ex
+++ b/lib/mv_web/live/member_live/index.ex
@@ -27,11 +27,8 @@ defmodule MvWeb.MemberLive.Index do
   """
   use MvWeb, :live_view
 
-  on_mount {MvWeb.LiveHelpers, :ensure_user_role_loaded}
-
   require Ash.Query
   import Ash.Expr
-  import MvWeb.LiveHelpers, only: [current_actor: 1]
 
   alias Mv.Membership
   alias MvWeb.Helpers.DateFormatter
@@ -58,21 +55,20 @@ defmodule MvWeb.MemberLive.Index do
   @impl true
   def mount(_params, session, socket) do
     # Load custom fields that should be shown in overview (for display)
-    # Errors in mount are handled by Phoenix LiveView and result in a 500 error page.
-    # This is appropriate for initialization errors that should be visible to the user.
-    actor = current_actor(socket)
-
+    # Note: Using Ash.read! (bang version) - errors will be handled by Phoenix LiveView
+    # and result in a 500 error page. This is appropriate for LiveViews where errors
+    # should be visible to the user rather than silently failing.
     custom_fields_visible =
       Mv.Membership.CustomField
       |> Ash.Query.filter(expr(show_in_overview == true))
       |> Ash.Query.sort(name: :asc)
-      |> Ash.read!(actor: actor)
+      |> Ash.read!()
 
     # Load ALL custom fields for the dropdown (to show all available fields)
     all_custom_fields =
       Mv.Membership.CustomField
       |> Ash.Query.sort(name: :asc)
-      |> Ash.read!(actor: actor)
+      |> Ash.read!()
 
     # Load settings once to avoid N+1 queries
     settings =
@@ -134,41 +130,13 @@ defmodule MvWeb.MemberLive.Index do
   """
   @impl true
   def handle_event("delete", %{"id" => id}, socket) do
-    actor = current_actor(socket)
+    # Note: Using bang versions (!) - errors will be handled by Phoenix LiveView
+    # This ensures users see error messages if deletion fails (e.g., permission denied)
+    member = Ash.get!(Mv.Membership.Member, id)
+    Ash.destroy!(member)
 
-    case Ash.get(Mv.Membership.Member, id, actor: actor) do
-      {:ok, member} ->
-        case Ash.destroy(member, actor: actor) do
-          :ok ->
-            updated_members = Enum.reject(socket.assigns.members, &(&1.id == id))
-
-            {:noreply,
-             socket
-             |> assign(:members, updated_members)
-             |> put_flash(:info, gettext("Member deleted successfully"))}
-
-          {:error, %Ash.Error.Forbidden{}} ->
-            {:noreply,
-             put_flash(
-               socket,
-               :error,
-               gettext("You do not have permission to delete this member")
-             )}
-
-          {:error, error} ->
-            {:noreply, put_flash(socket, :error, format_error(error))}
-        end
-
-      {:error, %Ash.Error.Query.NotFound{}} ->
-        {:noreply, put_flash(socket, :error, gettext("Member not found"))}
-
-      {:error, %Ash.Error.Forbidden{} = _error} ->
-        {:noreply,
-         put_flash(socket, :error, gettext("You do not have permission to access this member"))}
-
-      {:error, error} ->
-        {:noreply, put_flash(socket, :error, format_error(error))}
-    end
+    updated_members = Enum.reject(socket.assigns.members, &(&1.id == id))
+    {:noreply, assign(socket, :members, updated_members)}
   end
 
   @impl true
@@ -268,24 +236,6 @@ defmodule MvWeb.MemberLive.Index do
     end
   end
 
-  # Helper to format errors for display
-  defp format_error(%Ash.Error.Invalid{errors: errors}) do
-    error_messages =
-      Enum.map(errors, fn error ->
-        case error do
-          %{field: field, message: message} -> "#{field}: #{message}"
-          %{message: message} -> message
-          _ -> inspect(error)
-        end
-      end)
-
-    Enum.join(error_messages, ", ")
-  end
-
-  defp format_error(error) do
-    inspect(error)
-  end
-
   # -----------------------------------------------------------------
   # Handle Infos from Child Components
   # -----------------------------------------------------------------
@@ -726,9 +676,9 @@ defmodule MvWeb.MemberLive.Index do
         socket.assigns.custom_fields_visible
       )
 
-    # Errors in handle_params are handled by Phoenix LiveView
-    actor = current_actor(socket)
-    members = Ash.read!(query, actor: actor)
+    # Note: Using Ash.read! - errors will be handled by Phoenix LiveView
+    # This is appropriate for data loading in LiveViews
+    members = Ash.read!(query)
 
     # Custom field values are already filtered at the database level in load_custom_field_values/2
     # No need for in-memory filtering anymore
diff --git a/lib/mv_web/live/member_live/show.ex b/lib/mv_web/live/member_live/show.ex
index 1d79bca..997cb1a 100644
--- a/lib/mv_web/live/member_live/show.ex
+++ b/lib/mv_web/live/member_live/show.ex
@@ -20,9 +20,6 @@ defmodule MvWeb.MemberLive.Show do
   """
   use MvWeb, :live_view
   import Ash.Query
-  import MvWeb.LiveHelpers, only: [current_actor: 1]
-
-  on_mount {MvWeb.LiveHelpers, :ensure_user_role_loaded}
 
   alias MvWeb.Helpers.MembershipFeeHelpers
 
@@ -223,7 +220,6 @@ defmodule MvWeb.MemberLive.Show do
           module={MvWeb.MemberLive.Show.MembershipFeesComponent}
           id={"membership-fees-#{@member.id}"}
           member={@member}
-          current_user={@current_user}
         />
       <% end %>
     </Layouts.app>
@@ -237,14 +233,12 @@ defmodule MvWeb.MemberLive.Show do
 
   @impl true
   def handle_params(%{"id" => id}, _, socket) do
-    actor = current_actor(socket)
-
     # Load custom fields once using assign_new to avoid repeated queries
     socket =
       assign_new(socket, :custom_fields, fn ->
         Mv.Membership.CustomField
         |> Ash.Query.sort(name: :asc)
-        |> Ash.read!(actor: actor)
+        |> Ash.read!()
       end)
 
     query =
@@ -257,7 +251,7 @@ defmodule MvWeb.MemberLive.Show do
         membership_fee_cycles: [:membership_fee_type]
       ])
 
-    member = Ash.read_one!(query, actor: actor)
+    member = Ash.read_one!(query)
 
     # Calculate last and current cycle status from loaded cycles
     last_cycle_status = get_last_cycle_status(member)
diff --git a/lib/mv_web/live/member_live/show/membership_fees_component.ex b/lib/mv_web/live/member_live/show/membership_fees_component.ex
index e85baab..d8c49eb 100644
--- a/lib/mv_web/live/member_live/show/membership_fees_component.ex
+++ b/lib/mv_web/live/member_live/show/membership_fees_component.ex
@@ -13,14 +13,12 @@ defmodule MvWeb.MemberLive.Show.MembershipFeesComponent do
   use MvWeb, :live_component
 
   require Ash.Query
-  import MvWeb.LiveHelpers, only: [current_actor: 1]
 
   alias Mv.Membership
-  alias Mv.MembershipFees
-  alias Mv.MembershipFees.MembershipFeeType
-  alias Mv.MembershipFees.MembershipFeeCycle
-  alias Mv.MembershipFees.CycleGenerator
   alias Mv.MembershipFees.CalendarCycles
+  alias Mv.MembershipFees.CycleGenerator
+  alias Mv.MembershipFees.MembershipFeeCycle
+  alias Mv.MembershipFees.MembershipFeeType
   alias MvWeb.Helpers.MembershipFeeHelpers
 
   @impl true
@@ -65,7 +63,7 @@ defmodule MvWeb.MemberLive.Show.MembershipFeesComponent do
             phx-click="delete_all_cycles"
             phx-target={@myself}
             class="btn btn-sm btn-error btn-outline"
-            title={gettext("Delete all cycles")}
+            title={gettext("Delete All Cycles")}
           >
             <.icon name="hero-trash" class="size-4" />
             {gettext("Delete All Cycles")}
@@ -170,7 +168,7 @@ defmodule MvWeb.MemberLive.Show.MembershipFeesComponent do
                   phx-value-cycle_id={cycle.id}
                   phx-target={@myself}
                   class="btn btn-sm btn-error btn-outline"
-                  title={gettext("Delete cycle")}
+                  title={gettext("Delete Cycle")}
                 >
                   <.icon name="hero-trash" class="size-4" />
                   {gettext("Delete")}
@@ -331,16 +329,14 @@ defmodule MvWeb.MemberLive.Show.MembershipFeesComponent do
                 />
                 <label class="label">
                   <span class="label-text-alt">
-                    {gettext(
-                      "The cycle period will be calculated based on this date and the interval."
-                    )}
+                    {gettext("The cycle will be calculated based on this date and the interval.")}
                   </span>
                 </label>
               </div>
               <%= if @create_cycle_date do %>
                 <div class="form-control w-full mt-4">
                   <label class="label">
-                    <span class="label-text">{gettext("Cycle Period")}</span>
+                    <span class="label-text">{gettext("Cycle")}</span>
                   </label>
                   <div class="text-sm text-base-content/70">
                     {format_create_cycle_period(
@@ -392,7 +388,6 @@ defmodule MvWeb.MemberLive.Show.MembershipFeesComponent do
   @impl true
   def update(assigns, socket) do
     member = assigns.member
-    actor = assigns.current_user
 
     # Load cycles if not already loaded
     cycles =
@@ -406,7 +401,7 @@ defmodule MvWeb.MemberLive.Show.MembershipFeesComponent do
     cycles = Enum.sort_by(cycles, & &1.cycle_start, {:desc, Date})
 
     # Get available fee types (filtered to same interval if member has a type)
-    available_fee_types = get_available_fee_types(member, actor)
+    available_fee_types = get_available_fee_types(member)
 
     {:ok,
      socket
@@ -427,9 +422,7 @@ defmodule MvWeb.MemberLive.Show.MembershipFeesComponent do
   @impl true
   def handle_event("change_membership_fee_type", %{"value" => ""}, socket) do
     # Remove membership fee type
-    actor = current_actor(socket)
-
-    case update_member_fee_type(socket.assigns.member, nil, actor) do
+    case update_member_fee_type(socket.assigns.member, nil) do
       {:ok, updated_member} ->
         send(self(), {:member_updated, updated_member})
 
@@ -437,10 +430,7 @@ defmodule MvWeb.MemberLive.Show.MembershipFeesComponent do
          socket
          |> assign(:member, updated_member)
          |> assign(:cycles, [])
-         |> assign(
-           :available_fee_types,
-           get_available_fee_types(updated_member, current_actor(socket))
-         )
+         |> assign(:available_fee_types, get_available_fee_types(updated_member))
          |> assign(:interval_warning, nil)
          |> put_flash(:info, gettext("Membership fee type removed"))}
 
@@ -451,8 +441,7 @@ defmodule MvWeb.MemberLive.Show.MembershipFeesComponent do
 
   def handle_event("change_membership_fee_type", %{"value" => fee_type_id}, socket) do
     member = socket.assigns.member
-    actor = current_actor(socket)
-    new_fee_type = Ash.get!(MembershipFeeType, fee_type_id, domain: MembershipFees, actor: actor)
+    new_fee_type = Ash.get!(MembershipFeeType, fee_type_id, domain: MembershipFees)
 
     # Check if interval matches
     interval_warning =
@@ -470,22 +459,15 @@ defmodule MvWeb.MemberLive.Show.MembershipFeesComponent do
     if interval_warning do
       {:noreply, assign(socket, :interval_warning, interval_warning)}
     else
-      actor = current_actor(socket)
-
-      case update_member_fee_type(member, fee_type_id, actor) do
+      case update_member_fee_type(member, fee_type_id) do
         {:ok, updated_member} ->
           # Reload member with cycles
-          actor = current_actor(socket)
-
           updated_member =
             updated_member
-            |> Ash.load!(
-              [
-                :membership_fee_type,
-                membership_fee_cycles: [:membership_fee_type]
-              ],
-              actor: actor
-            )
+            |> Ash.load!([
+              :membership_fee_type,
+              membership_fee_cycles: [:membership_fee_type]
+            ])
 
           cycles =
             Enum.sort_by(
@@ -500,10 +482,7 @@ defmodule MvWeb.MemberLive.Show.MembershipFeesComponent do
            socket
            |> assign(:member, updated_member)
            |> assign(:cycles, cycles)
-           |> assign(
-             :available_fee_types,
-             get_available_fee_types(updated_member, current_actor(socket))
-           )
+           |> assign(:available_fee_types, get_available_fee_types(updated_member))
            |> assign(:interval_warning, nil)
            |> put_flash(:info, gettext("Membership fee type updated. Cycles regenerated."))}
 
@@ -524,9 +503,7 @@ defmodule MvWeb.MemberLive.Show.MembershipFeesComponent do
         :suspended -> :mark_as_suspended
       end
 
-    actor = current_actor(socket)
-
-    case Ash.update(cycle, action: action, domain: MembershipFees, actor: actor) do
+    case Ash.update(cycle, action: action, domain: MembershipFees) do
       {:ok, updated_cycle} ->
         updated_cycles = replace_cycle(socket.assigns.cycles, updated_cycle)
 
@@ -556,22 +533,16 @@ defmodule MvWeb.MemberLive.Show.MembershipFeesComponent do
   def handle_event("regenerate_cycles", _params, socket) do
     socket = assign(socket, :regenerating, true)
     member = socket.assigns.member
-    actor = current_actor(socket)
 
-    case CycleGenerator.generate_cycles_for_member(member.id, actor: actor) do
+    case CycleGenerator.generate_cycles_for_member(member.id) do
       {:ok, _new_cycles, _notifications} ->
         # Reload member with cycles
-        actor = current_actor(socket)
-
         updated_member =
           member
-          |> Ash.load!(
-            [
-              :membership_fee_type,
-              membership_fee_cycles: [:membership_fee_type]
-            ],
-            actor: actor
-          )
+          |> Ash.load!([
+            :membership_fee_type,
+            membership_fee_cycles: [:membership_fee_type]
+          ])
 
         cycles =
           Enum.sort_by(
@@ -601,8 +572,7 @@ defmodule MvWeb.MemberLive.Show.MembershipFeesComponent do
     cycle = find_cycle(socket.assigns.cycles, cycle_id)
 
     # Load cycle with membership_fee_type for display
-    actor = current_actor(socket)
-    cycle = Ash.load!(cycle, :membership_fee_type, actor: actor)
+    cycle = Ash.load!(cycle, :membership_fee_type)
 
     {:noreply, assign(socket, :editing_cycle, cycle)}
   end
@@ -619,11 +589,9 @@ defmodule MvWeb.MemberLive.Show.MembershipFeesComponent do
 
     case Decimal.parse(normalized_amount_str) do
       {amount, _} when is_struct(amount, Decimal) ->
-        actor = current_actor(socket)
-
         case cycle
              |> Ash.Changeset.for_update(:update, %{amount: amount})
-             |> Ash.update(domain: MembershipFees, actor: actor) do
+             |> Ash.update(domain: MembershipFees) do
           {:ok, updated_cycle} ->
             updated_cycles = replace_cycle(socket.assigns.cycles, updated_cycle)
 
@@ -648,8 +616,7 @@ defmodule MvWeb.MemberLive.Show.MembershipFeesComponent do
     cycle = find_cycle(socket.assigns.cycles, cycle_id)
 
     # Load cycle with membership_fee_type for display
-    actor = current_actor(socket)
-    cycle = Ash.load!(cycle, :membership_fee_type, actor: actor)
+    cycle = Ash.load!(cycle, :membership_fee_type)
 
     {:noreply, assign(socket, :deleting_cycle, cycle)}
   end
@@ -660,9 +627,8 @@ defmodule MvWeb.MemberLive.Show.MembershipFeesComponent do
 
   def handle_event("confirm_delete_cycle", %{"cycle_id" => cycle_id}, socket) do
     cycle = find_cycle(socket.assigns.cycles, cycle_id)
-    actor = current_actor(socket)
 
-    case Ash.destroy(cycle, domain: MembershipFees, actor: actor) do
+    case Ash.destroy(cycle, domain: MembershipFees) do
       :ok ->
         updated_cycles = Enum.reject(socket.assigns.cycles, &(&1.id == cycle_id))
 
@@ -733,17 +699,12 @@ defmodule MvWeb.MemberLive.Show.MembershipFeesComponent do
 
       if deleted_count > 0 do
         # Reload member to get updated cycles
-        actor = current_actor(socket)
-
         updated_member =
           member
-          |> Ash.load!(
-            [
-              :membership_fee_type,
-              membership_fee_cycles: [:membership_fee_type]
-            ],
-            actor: actor
-          )
+          |> Ash.load!([
+            :membership_fee_type,
+            membership_fee_cycles: [:membership_fee_type]
+          ])
 
         updated_cycles =
           Enum.sort_by(
@@ -825,20 +786,15 @@ defmodule MvWeb.MemberLive.Show.MembershipFeesComponent do
         membership_fee_type_id: member.membership_fee_type_id
       }
 
-      actor = current_actor(socket)
-
-      case Ash.create(MembershipFeeCycle, attrs, domain: MembershipFees, actor: actor) do
+      case Ash.create(MembershipFeeCycle, attrs, domain: MembershipFees) do
         {:ok, _new_cycle} ->
           # Reload member with cycles
           updated_member =
             member
-            |> Ash.load!(
-              [
-                :membership_fee_type,
-                membership_fee_cycles: [:membership_fee_type]
-              ],
-              actor: actor
-            )
+            |> Ash.load!([
+              :membership_fee_type,
+              membership_fee_cycles: [:membership_fee_type]
+            ])
 
           cycles =
             Enum.sort_by(
@@ -886,11 +842,11 @@ defmodule MvWeb.MemberLive.Show.MembershipFeesComponent do
 
   # Helper functions
 
-  defp get_available_fee_types(member, actor) do
+  defp get_available_fee_types(member) do
     all_types =
       MembershipFeeType
       |> Ash.Query.sort(name: :asc)
-      |> Ash.read!(domain: MembershipFees, actor: actor)
+      |> Ash.read!()
 
     # If member has a fee type, filter to same interval
     if member.membership_fee_type do
@@ -902,12 +858,12 @@ defmodule MvWeb.MemberLive.Show.MembershipFeesComponent do
     end
   end
 
-  defp update_member_fee_type(member, fee_type_id, actor) do
+  defp update_member_fee_type(member, fee_type_id) do
     attrs = %{membership_fee_type_id: fee_type_id}
 
     member
     |> Ash.Changeset.for_update(:update_member, attrs, domain: Membership)
-    |> Ash.update(domain: Membership, actor: actor)
+    |> Ash.update(domain: Membership)
   end
 
   defp find_cycle(cycles, cycle_id) do
diff --git a/lib/mv_web/live/membership_fee_settings_live.ex b/lib/mv_web/live/membership_fee_settings_live.ex
index a98ccdb..61774e8 100644
--- a/lib/mv_web/live/membership_fee_settings_live.ex
+++ b/lib/mv_web/live/membership_fee_settings_live.ex
@@ -63,9 +63,7 @@ defmodule MvWeb.MembershipFeeSettingsLive do
         Map.put(params, "include_joining_cycle", false)
       end
 
-    actor = MvWeb.LiveHelpers.current_actor(socket)
-
-    case MvWeb.LiveHelpers.submit_form(socket.assigns.form, normalized_params, actor) do
+    case AshPhoenix.Form.submit(socket.assigns.form, params: normalized_params) do
       {:ok, updated_settings} ->
         {:noreply,
          socket
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..77a73af 100644
--- a/lib/mv_web/live/membership_fee_type_live/form.ex
+++ b/lib/mv_web/live/membership_fee_type_live/form.ex
@@ -13,9 +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
 
   alias Mv.Membership.Member
@@ -308,9 +305,7 @@ defmodule MvWeb.MembershipFeeTypeLive.Form do
     if socket.assigns.show_amount_warning do
       {:noreply, put_flash(socket, :error, gettext("Please confirm the amount change first"))}
     else
-      actor = current_actor(socket)
-
-      case submit_form(socket.assigns.form, params, actor) do
+      case AshPhoenix.Form.submit(socket.assigns.form, params: params) do
         {:ok, membership_fee_type} ->
           notify_parent({:saved, membership_fee_type})
 
@@ -385,7 +380,7 @@ defmodule MvWeb.MembershipFeeTypeLive.Form do
   @spec return_path(String.t(), MembershipFeeType.t() | nil) :: String.t()
   defp return_path("index", _membership_fee_type), do: ~p"/membership_fee_types"
 
-  @spec get_affected_member_count(String.t(), Mv.Accounts.User.t() | nil) :: non_neg_integer()
+  @spec get_affected_member_count(String.t()) :: non_neg_integer()
   # Checks if amount changed and updates socket assigns accordingly
   defp check_amount_change(socket, params) do
     if socket.assigns.membership_fee_type && Map.has_key?(params, "amount") do
@@ -433,7 +428,7 @@ defmodule MvWeb.MembershipFeeTypeLive.Form do
         socket.assigns.affected_member_count
       else
         # Warning being shown for first time, calculate count
-        get_affected_member_count(socket.assigns.membership_fee_type.id, current_actor(socket))
+        get_affected_member_count(socket.assigns.membership_fee_type.id)
       end
 
     socket
@@ -451,10 +446,8 @@ defmodule MvWeb.MembershipFeeTypeLive.Form do
     |> assign(:pending_amount, nil)
   end
 
-  defp get_affected_member_count(fee_type_id, actor) do
-    case Ash.count(Member |> Ash.Query.filter(membership_fee_type_id == ^fee_type_id),
-           actor: actor
-         ) do
+  defp get_affected_member_count(fee_type_id) do
+    case Ash.count(Member |> Ash.Query.filter(membership_fee_type_id == ^fee_type_id)) do
       {:ok, count} -> count
       _ -> 0
     end
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..f105058 100644
--- a/lib/mv_web/live/membership_fee_type_live/index.ex
+++ b/lib/mv_web/live/membership_fee_type_live/index.ex
@@ -14,9 +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
 
   alias Mv.Membership
@@ -27,9 +24,8 @@ defmodule MvWeb.MembershipFeeTypeLive.Index do
 
   @impl true
   def mount(_params, _session, socket) do
-    actor = current_actor(socket)
-    fee_types = load_membership_fee_types(actor)
-    member_counts = load_member_counts(fee_types, actor)
+    fee_types = load_membership_fee_types()
+    member_counts = load_member_counts(fee_types)
 
     {:ok,
      socket
@@ -133,43 +129,18 @@ defmodule MvWeb.MembershipFeeTypeLive.Index do
 
   @impl true
   def handle_event("delete", %{"id" => id}, socket) do
-    actor = current_actor(socket)
+    fee_type = Ash.get!(MembershipFeeType, id, domain: MembershipFees)
 
-    case Ash.get(MembershipFeeType, id, domain: MembershipFees, actor: actor) do
-      {:ok, fee_type} ->
-        case Ash.destroy(fee_type, domain: MembershipFees, actor: actor) do
-          :ok ->
-            updated_types = Enum.reject(socket.assigns.membership_fee_types, &(&1.id == id))
-            updated_counts = Map.delete(socket.assigns.member_counts, id)
+    case Ash.destroy(fee_type, domain: MembershipFees) do
+      :ok ->
+        updated_types = Enum.reject(socket.assigns.membership_fee_types, &(&1.id == id))
+        updated_counts = Map.delete(socket.assigns.member_counts, id)
 
-            {:noreply,
-             socket
-             |> assign(:membership_fee_types, updated_types)
-             |> assign(:member_counts, updated_counts)
-             |> put_flash(:info, gettext("Membership fee type deleted"))}
-
-          {:error, %Ash.Error.Forbidden{}} ->
-            {:noreply,
-             put_flash(
-               socket,
-               :error,
-               gettext("You do not have permission to delete this membership fee type")
-             )}
-
-          {:error, error} ->
-            {:noreply, put_flash(socket, :error, format_error(error))}
-        end
-
-      {:error, %Ash.Error.Query.NotFound{}} ->
-        {:noreply, put_flash(socket, :error, gettext("Membership fee type not found"))}
-
-      {:error, %Ash.Error.Forbidden{} = _error} ->
         {:noreply,
-         put_flash(
-           socket,
-           :error,
-           gettext("You do not have permission to access this membership fee type")
-         )}
+         socket
+         |> assign(:membership_fee_types, updated_types)
+         |> assign(:member_counts, updated_counts)
+         |> put_flash(:info, gettext("Membership fee type deleted"))}
 
       {:error, error} ->
         {:noreply, put_flash(socket, :error, format_error(error))}
@@ -178,14 +149,14 @@ defmodule MvWeb.MembershipFeeTypeLive.Index do
 
   # Helper functions
 
-  defp load_membership_fee_types(actor) do
+  defp load_membership_fee_types do
     MembershipFeeType
     |> Ash.Query.sort(name: :asc)
-    |> Ash.read!(domain: MembershipFees, actor: actor)
+    |> Ash.read!(domain: MembershipFees)
   end
 
   # Loads all member counts for fee types in a single query to avoid N+1 queries
-  defp load_member_counts(fee_types, actor) do
+  defp load_member_counts(fee_types) do
     fee_type_ids = Enum.map(fee_types, & &1.id)
 
     # Load all members with membership_fee_type_id in a single query
@@ -193,7 +164,7 @@ defmodule MvWeb.MembershipFeeTypeLive.Index do
       Member
       |> Ash.Query.filter(membership_fee_type_id in ^fee_type_ids)
       |> Ash.Query.select([:membership_fee_type_id])
-      |> Ash.read!(domain: Membership, actor: actor)
+      |> Ash.read!(domain: Membership)
 
     # Group by membership_fee_type_id and count
     members
diff --git a/lib/mv_web/live/role_live/form.ex b/lib/mv_web/live/role_live/form.ex
index 0ad0fdd..7b74c7e 100644
--- a/lib/mv_web/live/role_live/form.ex
+++ b/lib/mv_web/live/role_live/form.ex
@@ -162,9 +162,7 @@ defmodule MvWeb.RoleLive.Form do
   end
 
   def handle_event("save", %{"role" => role_params}, socket) do
-    actor = MvWeb.LiveHelpers.current_actor(socket)
-
-    case MvWeb.LiveHelpers.submit_form(socket.assigns.form, role_params, actor) do
+    case AshPhoenix.Form.submit(socket.assigns.form, params: role_params) do
       {:ok, role} ->
         notify_parent({:saved, role})
 
diff --git a/lib/mv_web/live/role_live/index.ex b/lib/mv_web/live/role_live/index.ex
index 4f8e45d..9d75da6 100644
--- a/lib/mv_web/live/role_live/index.ex
+++ b/lib/mv_web/live/role_live/index.ex
@@ -118,7 +118,7 @@ defmodule MvWeb.RoleLive.Index do
 
   @spec load_roles(map() | nil) :: [Mv.Authorization.Role.t()]
   defp load_roles(actor) do
-    opts = MvWeb.LiveHelpers.ash_actor_opts(actor)
+    opts = if actor, do: [actor: actor], else: []
 
     case Authorization.list_roles(opts) do
       {:ok, roles} -> Enum.sort_by(roles, & &1.name)
diff --git a/lib/mv_web/live/user_live/form.ex b/lib/mv_web/live/user_live/form.ex
index 7b02053..f0cc1ce 100644
--- a/lib/mv_web/live/user_live/form.ex
+++ b/lib/mv_web/live/user_live/form.ex
@@ -33,9 +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
   def render(assigns) do
     ~H"""
@@ -261,12 +258,10 @@ defmodule MvWeb.UserLive.Form do
 
   @impl true
   def mount(params, _session, socket) do
-    actor = current_actor(socket)
-
     user =
       case params["id"] do
         nil -> nil
-        id -> Ash.get!(Mv.Accounts.User, id, domain: Mv.Accounts, load: [:member], actor: actor)
+        id -> Ash.get!(Mv.Accounts.User, id, domain: Mv.Accounts, load: [:member])
       end
 
     action = if is_nil(user), do: gettext("New"), else: gettext("Edit")
@@ -305,7 +300,6 @@ defmodule MvWeb.UserLive.Form do
     {:noreply, socket}
   end
 
-  @impl true
   def handle_event("validate", %{"user" => user_params}, socket) do
     validated_form = AshPhoenix.Form.validate(socket.assigns.form, user_params)
 
@@ -313,7 +307,7 @@ defmodule MvWeb.UserLive.Form do
     socket =
       if Map.has_key?(user_params, "email") do
         user_email = user_params["email"]
-        members = load_members_for_linking(user_email, socket.assigns.member_search_query, socket)
+        members = load_members_for_linking(user_email, socket.assigns.member_search_query)
 
         assign(socket, form: validated_form, available_members: members)
       else
@@ -323,30 +317,62 @@ defmodule MvWeb.UserLive.Form do
     {:noreply, socket}
   end
 
-  @impl true
   def handle_event("save", %{"user" => user_params}, socket) do
-    actor = current_actor(socket)
     # First save the user without member changes
-    case submit_form(socket.assigns.form, user_params, actor) do
+    case AshPhoenix.Form.submit(socket.assigns.form, params: user_params) do
       {:ok, user} ->
-        handle_member_linking(socket, user, actor)
+        # Then handle member linking/unlinking as a separate step
+        result =
+          cond do
+            # Selected member ID takes precedence (new link)
+            socket.assigns.selected_member_id ->
+              Mv.Accounts.update_user(user, %{member: %{id: socket.assigns.selected_member_id}})
+
+            # Unlink flag is set
+            socket.assigns[:unlink_member] ->
+              Mv.Accounts.update_user(user, %{member: nil})
+
+            # No changes to member relationship
+            true ->
+              {:ok, user}
+          end
+
+        case result do
+          {:ok, updated_user} ->
+            notify_parent({:saved, updated_user})
+
+            socket =
+              socket
+              |> put_flash(:info, "User #{socket.assigns.form.source.type}d successfully")
+              |> push_navigate(to: return_path(socket.assigns.return_to, updated_user))
+
+            {:noreply, socket}
+
+          {:error, error} ->
+            # Show user-friendly error from member linking/unlinking
+            error_message = extract_error_message(error)
+
+            {:noreply,
+             put_flash(
+               socket,
+               :error,
+               gettext("Failed to link member: %{error}", error: error_message)
+             )}
+        end
 
       {:error, form} ->
         {:noreply, assign(socket, form: form)}
     end
   end
 
-  @impl true
   def handle_event("show_member_dropdown", _params, socket) do
     {:noreply, assign(socket, show_member_dropdown: true)}
   end
 
-  @impl true
   def handle_event("hide_member_dropdown", _params, socket) do
     {:noreply, assign(socket, show_member_dropdown: false, focused_member_index: nil)}
   end
 
-  @impl true
   def handle_event("member_dropdown_keydown", %{"key" => "ArrowDown"}, socket) do
     return_if_dropdown_closed(socket, fn ->
       max_index = length(socket.assigns.available_members) - 1
@@ -363,7 +389,6 @@ defmodule MvWeb.UserLive.Form do
     end)
   end
 
-  @impl true
   def handle_event("member_dropdown_keydown", %{"key" => "ArrowUp"}, socket) do
     return_if_dropdown_closed(socket, fn ->
       current = socket.assigns.focused_member_index
@@ -379,27 +404,23 @@ defmodule MvWeb.UserLive.Form do
     end)
   end
 
-  @impl true
   def handle_event("member_dropdown_keydown", %{"key" => "Enter"}, socket) do
     return_if_dropdown_closed(socket, fn ->
       select_focused_member(socket)
     end)
   end
 
-  @impl true
   def handle_event("member_dropdown_keydown", %{"key" => "Escape"}, socket) do
     return_if_dropdown_closed(socket, fn ->
       {:noreply, assign(socket, show_member_dropdown: false, focused_member_index: nil)}
     end)
   end
 
-  @impl true
   def handle_event("member_dropdown_keydown", _params, socket) do
     # Ignore other keys
     {:noreply, socket}
   end
 
-  @impl true
   def handle_event("search_members", %{"member_search" => query}, socket) do
     socket =
       socket
@@ -411,7 +432,6 @@ defmodule MvWeb.UserLive.Form do
     {:noreply, socket}
   end
 
-  @impl true
   def handle_event("select_member", %{"id" => member_id}, socket) do
     # Find the selected member to get their name
     selected_member = Enum.find(socket.assigns.available_members, &(&1.id == member_id))
@@ -428,82 +448,27 @@ defmodule MvWeb.UserLive.Form do
       |> assign(:selected_member_name, member_name)
       |> assign(:unlink_member, false)
       |> assign(:show_member_dropdown, false)
-      |> assign(:focused_member_index, nil)
+      |> assign(:member_search_query, member_name)
+      |> push_event("set-input-value", %{id: "member-search-input", value: member_name})
 
     {:noreply, socket}
   end
 
-  @impl true
   def handle_event("unlink_member", _params, socket) do
+    # Set flag to unlink member on save
+    # Clear all member selection state and keep dropdown hidden
     socket =
       socket
+      |> assign(:unlink_member, true)
       |> assign(:selected_member_id, nil)
       |> assign(:selected_member_name, nil)
-      |> assign(:unlink_member, true)
+      |> assign(:member_search_query, "")
       |> assign(:show_member_dropdown, false)
-      |> assign(:focused_member_index, nil)
+      |> load_initial_members()
 
     {:noreply, socket}
   end
 
-  defp handle_member_linking(socket, user, actor) do
-    result = perform_member_link_action(socket, user, actor)
-
-    case result do
-      {:ok, updated_user} ->
-        handle_save_success(socket, updated_user)
-
-      {:error, error} ->
-        handle_member_link_error(socket, error)
-    end
-  end
-
-  defp perform_member_link_action(socket, user, actor) do
-    cond do
-      # Selected member ID takes precedence (new link)
-      socket.assigns.selected_member_id ->
-        Mv.Accounts.update_user(user, %{member: %{id: socket.assigns.selected_member_id}},
-          actor: actor
-        )
-
-      # Unlink flag is set
-      socket.assigns[:unlink_member] ->
-        Mv.Accounts.update_user(user, %{member: nil}, actor: actor)
-
-      # No changes to member relationship
-      true ->
-        {:ok, user}
-    end
-  end
-
-  defp handle_save_success(socket, updated_user) do
-    notify_parent({:saved, updated_user})
-
-    action = get_action_name(socket.assigns.form.source.type)
-
-    socket =
-      socket
-      |> put_flash(:info, gettext("User %{action} successfully", action: action))
-      |> push_navigate(to: return_path(socket.assigns.return_to, updated_user))
-
-    {:noreply, socket}
-  end
-
-  defp get_action_name(:create), do: gettext("created")
-  defp get_action_name(:update), do: gettext("updated")
-  defp get_action_name(other), do: to_string(other)
-
-  defp handle_member_link_error(socket, error) do
-    error_message = extract_error_message(error)
-
-    {:noreply,
-     put_flash(
-       socket,
-       :error,
-       gettext("Failed to link member: %{error}", error: error_message)
-     )}
-  end
-
   @spec notify_parent(any()) :: any()
   defp notify_parent(msg), do: send(self(), {__MODULE__, msg})
 
@@ -532,21 +497,18 @@ defmodule MvWeb.UserLive.Form do
 
   @spec assign_form(Phoenix.LiveView.Socket.t()) :: Phoenix.LiveView.Socket.t()
   defp assign_form(%{assigns: %{user: user, show_password_fields: show_password_fields}} = socket) do
-    actor = current_actor(socket)
-
     form =
       if user do
         # For existing users, use admin password action if password fields are shown
         action = if show_password_fields, do: :admin_set_password, else: :update_user
-        AshPhoenix.Form.for_update(user, action, domain: Mv.Accounts, as: "user", actor: actor)
+        AshPhoenix.Form.for_update(user, action, domain: Mv.Accounts, as: "user")
       else
         # For new users, use password registration if password fields are shown
         action = if show_password_fields, do: :register_with_password, else: :create_user
 
         AshPhoenix.Form.for_create(Mv.Accounts.User, action,
           domain: Mv.Accounts,
-          as: "user",
-          actor: actor
+          as: "user"
         )
       end
 
@@ -562,7 +524,7 @@ defmodule MvWeb.UserLive.Form do
     user = socket.assigns.user
     user_email = if user, do: user.email, else: nil
 
-    members = load_members_for_linking(user_email, "", socket)
+    members = load_members_for_linking(user_email, "")
 
     # Dropdown should ALWAYS be hidden initially
     # It will only show when user focuses the input field (show_member_dropdown event)
@@ -577,15 +539,12 @@ defmodule MvWeb.UserLive.Form do
     user = socket.assigns.user
     user_email = if user, do: user.email, else: nil
 
-    members = load_members_for_linking(user_email, query, socket)
+    members = load_members_for_linking(user_email, query)
     assign(socket, available_members: members)
   end
 
-  @spec load_members_for_linking(String.t() | nil, String.t() | nil, Phoenix.LiveView.Socket.t()) ::
-          [
-            Mv.Membership.Member.t()
-          ]
-  defp load_members_for_linking(user_email, search_query, socket) do
+  @spec load_members_for_linking(String.t() | nil, String.t() | nil) :: [Mv.Membership.Member.t()]
+  defp load_members_for_linking(user_email, search_query) do
     user_email_str = if user_email, do: to_string(user_email), else: nil
     search_query_str = if search_query && search_query != "", do: search_query, else: nil
 
@@ -596,27 +555,20 @@ defmodule MvWeb.UserLive.Form do
         search_query: search_query_str
       })
 
-    actor = current_actor(socket)
+    case Ash.read(query, domain: Mv.Membership) do
+      {:ok, members} ->
+        # Apply email match filter if user_email is provided
+        if user_email_str do
+          Mv.Membership.Member.filter_by_email_match(members, user_email_str)
+        else
+          members
+        end
 
-    # Early return if no actor (prevents exceptions in unauthenticated tests)
-    if is_nil(actor) do
-      []
-    else
-      case Ash.read(query, domain: Mv.Membership, actor: actor) do
-        {:ok, members} -> apply_email_filter(members, user_email_str)
-        {:error, _} -> []
-      end
+      {:error, _} ->
+        []
     end
   end
 
-  @spec apply_email_filter([Mv.Membership.Member.t()], String.t() | nil) ::
-          [Mv.Membership.Member.t()]
-  defp apply_email_filter(members, nil), do: members
-
-  defp apply_email_filter(members, user_email_str) when is_binary(user_email_str) do
-    Mv.Membership.Member.filter_by_email_match(members, user_email_str)
-  end
-
   # Extract user-friendly error message from Ash.Error
   @spec extract_error_message(any()) :: String.t()
   defp extract_error_message(%Ash.Error.Invalid{errors: errors}) when is_list(errors) do
@@ -624,10 +576,10 @@ defmodule MvWeb.UserLive.Form do
     case List.first(errors) do
       %{message: message} when is_binary(message) -> message
       %{field: field, message: message} -> "#{field}: #{message}"
-      _ -> gettext("Unknown error")
+      _ -> "Unknown error"
     end
   end
 
   defp extract_error_message(error) when is_binary(error), do: error
-  defp extract_error_message(_), do: gettext("Unknown error")
+  defp extract_error_message(_), do: "Unknown error"
 end
diff --git a/lib/mv_web/live/user_live/index.ex b/lib/mv_web/live/user_live/index.ex
index 5e5949e..0c1d7be 100644
--- a/lib/mv_web/live/user_live/index.ex
+++ b/lib/mv_web/live/user_live/index.ex
@@ -23,13 +23,9 @@ 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
   def mount(_params, _session, socket) do
-    actor = current_actor(socket)
-    users = Ash.read!(Mv.Accounts.User, domain: Mv.Accounts, load: [:member], actor: actor)
+    users = Ash.read!(Mv.Accounts.User, domain: Mv.Accounts, load: [:member])
     sorted = Enum.sort_by(users, & &1.email)
 
     {:ok,
@@ -43,41 +39,11 @@ defmodule MvWeb.UserLive.Index do
 
   @impl true
   def handle_event("delete", %{"id" => id}, socket) do
-    actor = current_actor(socket)
+    user = Ash.get!(Mv.Accounts.User, id, domain: Mv.Accounts)
+    Ash.destroy!(user, domain: Mv.Accounts)
 
-    case Ash.get(Mv.Accounts.User, id, domain: Mv.Accounts, actor: actor) do
-      {:ok, user} ->
-        case Ash.destroy(user, domain: Mv.Accounts, actor: actor) do
-          :ok ->
-            updated_users = Enum.reject(socket.assigns.users, &(&1.id == id))
-
-            {:noreply,
-             socket
-             |> assign(:users, updated_users)
-             |> put_flash(:info, gettext("User deleted successfully"))}
-
-          {:error, %Ash.Error.Forbidden{}} ->
-            {:noreply,
-             put_flash(
-               socket,
-               :error,
-               gettext("You do not have permission to delete this user")
-             )}
-
-          {:error, error} ->
-            {:noreply, put_flash(socket, :error, format_error(error))}
-        end
-
-      {:error, %Ash.Error.Query.NotFound{}} ->
-        {:noreply, put_flash(socket, :error, gettext("User not found"))}
-
-      {:error, %Ash.Error.Forbidden{} = _error} ->
-        {:noreply,
-         put_flash(socket, :error, gettext("You do not have permission to access this user"))}
-
-      {:error, error} ->
-        {:noreply, put_flash(socket, :error, format_error(error))}
-    end
+    updated_users = Enum.reject(socket.assigns.users, &(&1.id == id))
+    {:noreply, assign(socket, :users, updated_users)}
   end
 
   # Selects one user in the list of users
@@ -138,12 +104,4 @@ defmodule MvWeb.UserLive.Index do
   defp toggle_order(:desc), do: :asc
   defp sort_fun(:asc), do: &<=/2
   defp sort_fun(:desc), do: &>=/2
-
-  defp format_error(%Ash.Error.Invalid{errors: errors}) do
-    Enum.map_join(errors, ", ", fn %{message: message} -> message end)
-  end
-
-  defp format_error(error) do
-    inspect(error)
-  end
 end
diff --git a/lib/mv_web/live/user_live/show.ex b/lib/mv_web/live/user_live/show.ex
index 4a5b5d1..9eaa4fa 100644
--- a/lib/mv_web/live/user_live/show.ex
+++ b/lib/mv_web/live/user_live/show.ex
@@ -26,9 +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
   def render(assigns) do
     ~H"""
@@ -73,8 +70,7 @@ defmodule MvWeb.UserLive.Show do
 
   @impl true
   def mount(%{"id" => id}, _session, socket) do
-    actor = current_actor(socket)
-    user = Ash.get!(Mv.Accounts.User, id, domain: Mv.Accounts, load: [:member], actor: actor)
+    user = Ash.get!(Mv.Accounts.User, id, domain: Mv.Accounts, load: [:member])
 
     {:ok,
      socket
diff --git a/lib/mv_web/live_helpers.ex b/lib/mv_web/live_helpers.ex
index 95d8235..f217ee2 100644
--- a/lib/mv_web/live_helpers.ex
+++ b/lib/mv_web/live_helpers.ex
@@ -59,53 +59,4 @@ defmodule MvWeb.LiveHelpers do
         user
     end
   end
-
-  @doc """
-  Helper function to get the current actor (user) from socket assigns.
-
-  Provides consistent access pattern across all LiveViews.
-  Returns nil if no current_user is present.
-
-  ## Examples
-
-      actor = current_actor(socket)
-      members = Membership.list_members!(actor: actor)
-  """
-  @spec current_actor(Phoenix.LiveView.Socket.t()) :: Mv.Accounts.User.t() | nil
-  def current_actor(socket) do
-    socket.assigns[:current_user] || socket.assigns.current_user
-  end
-
-  @doc """
-  Converts an actor to Ash options list for authorization.
-  Returns empty list if actor is nil.
-
-  Delegates to `Mv.Helpers.ash_actor_opts/1` for consistency across the application.
-
-  ## Examples
-
-      opts = ash_actor_opts(actor)
-      Ash.read(query, opts)
-  """
-  @spec ash_actor_opts(Mv.Accounts.User.t() | nil) :: keyword()
-  defdelegate ash_actor_opts(actor), to: Mv.Helpers
-
-  @doc """
-  Submits an AshPhoenix form with consistent actor handling.
-
-  This wrapper ensures that actor is always passed via `action_opts`
-  in a consistent manner across all LiveViews.
-
-  ## Examples
-
-      case submit_form(form, params, actor) do
-        {:ok, resource} -> # success
-        {:error, form} -> # validation errors
-      end
-  """
-  @spec submit_form(AshPhoenix.Form.t(), map(), Mv.Accounts.User.t() | nil) ::
-          {:ok, Ash.Resource.t()} | {:error, AshPhoenix.Form.t()}
-  def submit_form(form, params, actor) do
-    AshPhoenix.Form.submit(form, params: params, action_opts: ash_actor_opts(actor))
-  end
 end
diff --git a/mix.exs b/mix.exs
index 4092b7a..6aa5f9f 100644
--- a/mix.exs
+++ b/mix.exs
@@ -76,7 +76,6 @@ defmodule Mv.MixProject do
       {:mix_audit, "~> 2.1", only: [:dev, :test], runtime: false},
       {:sobelow, "~> 0.14", only: [:dev, :test], runtime: false},
       {:credo, "~> 1.7", only: [:dev, :test], runtime: false},
-      {:picosat_elixir, "~> 0.1", only: [:dev, :test]},
       {:ecto_commons, "~> 0.3"},
       {:slugify, "~> 1.3"}
     ]
diff --git a/mix.lock b/mix.lock
index 54b0e51..1808eba 100644
--- a/mix.lock
+++ b/mix.lock
@@ -60,7 +60,6 @@
   "phoenix_pubsub": {:hex, :phoenix_pubsub, "2.2.0", "ff3a5616e1bed6804de7773b92cbccfc0b0f473faf1f63d7daf1206c7aeaaa6f", [:mix], [], "hexpm", "adc313a5bf7136039f63cfd9668fde73bba0765e0614cba80c06ac9460ff3e96"},
   "phoenix_template": {:hex, :phoenix_template, "1.0.4", "e2092c132f3b5e5b2d49c96695342eb36d0ed514c5b252a77048d5969330d639", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}], "hexpm", "2c0c81f0e5c6753faf5cca2f229c9709919aba34fab866d3bc05060c9c444206"},
   "phoenix_view": {:hex, :phoenix_view, "2.0.4", "b45c9d9cf15b3a1af5fb555c674b525391b6a1fe975f040fb4d913397b31abf4", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}], "hexpm", "4e992022ce14f31fe57335db27a28154afcc94e9983266835bb3040243eb620b"},
-  "picosat_elixir": {:hex, :picosat_elixir, "0.2.3", "bf326d0f179fbb3b706bb2c15fbc367dacfa2517157d090fdfc32edae004c597", [:make, :mix], [{:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "f76c9db2dec9d2561ffaa9be35f65403d53e984e8cd99c832383b7ab78c16c66"},
   "plug": {:hex, :plug, "1.19.1", "09bac17ae7a001a68ae393658aa23c7e38782be5c5c00c80be82901262c394c0", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "560a0017a8f6d5d30146916862aaf9300b7280063651dd7e532b8be168511e62"},
   "plug_crypto": {:hex, :plug_crypto, "2.1.1", "19bda8184399cb24afa10be734f84a16ea0a2bc65054e23a62bb10f06bc89491", [:mix], [], "hexpm", "6470bce6ffe41c8bd497612ffde1a7e4af67f36a15eea5f921af71cf3e11247c"},
   "postgrex": {:hex, :postgrex, "0.21.1", "2c5cc830ec11e7a0067dd4d623c049b3ef807e9507a424985b8dcf921224cd88", [:mix], [{:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:table, "~> 0.1.0", [hex: :table, repo: "hexpm", optional: true]}], "hexpm", "27d8d21c103c3cc68851b533ff99eef353e6a0ff98dc444ea751de43eb48bdac"},
diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po
index 33dff0f..abf6f8d 100644
--- a/priv/gettext/de/LC_MESSAGES/default.po
+++ b/priv/gettext/de/LC_MESSAGES/default.po
@@ -8,7 +8,7 @@
 ## to merge POT files into PO files.
 msgid ""
 msgstr ""
-"Language: de\n"
+"Language: en\n"
 
 #: lib/mv_web/components/core_components.ex
 #: lib/mv_web/live/contribution_period_live/show.ex
@@ -1313,14 +1313,14 @@ msgid "These fields are neccessary for MILA to handle member identification and
 msgstr "Diese Datenfelder sind für MILA notwendig um Mitglieder zu identifizieren und zukünftig Beitragszahlungen zu berechnen. Aus diesem Grund können sie nicht gelöscht, aber in der Übersicht ausgeblendet werden."
 
 #: lib/mv_web/live/global_settings_live.ex
-#, elixir-autogen, elixir-format
+#, elixir-autogen, elixir-format, fuzzy
 msgid "Member field %{action} successfully"
-msgstr "Mitgliedsfeld wurde erfolgreich %{action}"
+msgstr "Mitglied wurde erfolgreich %{action}"
 
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
 #, elixir-autogen, elixir-format
 msgid "A cycle for this period already exists"
-msgstr "Ein Zyklus für diesen Zeitraum existiert bereits"
+msgstr "Für dieses Intervall besteht bereits ein Zyklus."
 
 #: lib/mv_web/live/membership_fee_type_live/index.ex
 #, elixir-autogen, elixir-format
@@ -1367,7 +1367,7 @@ msgstr "Die Änderung des Betrags betrifft %{count} Mitglied(er)."
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
 #, elixir-autogen, elixir-format
 msgid "Click to edit amount"
-msgstr "Klicken Sie, um den Betrag zu bearbeiten"
+msgstr "Klicke um den Betrag zu ändern"
 
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
@@ -1397,12 +1397,12 @@ msgstr "erstellt"
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Create Cycle"
-msgstr "Zyklus erstellen"
+msgstr "Aktueller Zyklus"
 
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
 #, elixir-autogen, elixir-format
 msgid "Create a new cycle manually"
-msgstr "Einen neuen Zyklus manuell erstellen"
+msgstr "Erstelle manuell einen neuen Zyklus"
 
 #: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
@@ -1432,7 +1432,7 @@ msgstr "Zyklusbetrag aktualisiert"
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Cycle created successfully"
-msgstr "Zyklus erfolgreich erstellt"
+msgstr "Zyklen erfolgreich regeneriert"
 
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
 #, elixir-autogen, elixir-format
@@ -1475,9 +1475,9 @@ msgid "Edit Cycle Amount"
 msgstr "Zyklusbetrag bearbeiten"
 
 #: lib/mv_web/live/member_field_live/form_component.ex
-#, elixir-autogen, elixir-format
+#, elixir-autogen, elixir-format, fuzzy
 msgid "Edit Field: %{field}"
-msgstr "Feld bearbeiten: %{field}"
+msgstr "Mitglied bearbeiten"
 
 #: lib/mv_web/live/membership_fee_type_live/form.ex
 #, elixir-autogen, elixir-format
@@ -1525,9 +1525,9 @@ msgid "Invalid amount format"
 msgstr "Ungültiges Betragsformat"
 
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
-#, elixir-autogen, elixir-format
+#, elixir-autogen, elixir-format, fuzzy
 msgid "Invalid date format"
-msgstr "Ungültiges Datumsformat"
+msgstr "Ungültiges Betragsformat"
 
 #: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
@@ -1680,9 +1680,9 @@ msgid "Not set"
 msgstr "Nicht gesetzt"
 
 #: lib/mv_web/live/member_live/show.ex
-#, elixir-autogen, elixir-format
+#, elixir-autogen, elixir-format, fuzzy
 msgid "Payment Interval"
-msgstr "Zahlungsintervall"
+msgstr "Zahlungsfilter"
 
 #: lib/mv_web/live/membership_fee_type_live/form.ex
 #, elixir-autogen, elixir-format
@@ -1763,7 +1763,7 @@ msgstr "Art"
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
 #, elixir-autogen, elixir-format
 msgid "Type '%{confirmation}' to confirm"
-msgstr "Geben Sie '%{confirmation}' ein, um zu bestätigen"
+msgstr "Trage '%{confirmation}' ein um zu bestätigen"
 
 #: lib/mv_web/live/membership_fee_type_live/form.ex
 #, elixir-autogen, elixir-format
@@ -1826,6 +1826,11 @@ msgstr "Mitgliedsbeitragsstatus"
 msgid "Show/Hide Columns"
 msgstr "Spalten ein-/ausblenden"
 
+#: lib/mv_web/live/member_live/show/membership_fees_component.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "The cycle will be calculated based on this date and the interval."
+msgstr "Der Zyklus wird basierend auf diesem Datum und dem Intervall berechnet."
+
 #: lib/mv_web/live/custom_field_live/form_component.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Back to settings"
@@ -1875,78 +1880,78 @@ msgstr "Zurück zur Rollen-Liste"
 #: lib/mv_web/live/role_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Cannot delete system role"
-msgstr "System-Rolle kann nicht gelöscht werden"
+msgstr ""
 
 #: lib/mv_web/live/role_live/index.html.heex
-#, elixir-autogen, elixir-format
+#, elixir-autogen, elixir-format, fuzzy
 msgid "Custom"
-msgstr "Benutzerdefiniert"
+msgstr "Benutzerdefinierte Felder"
 
 #: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format
+#, elixir-autogen, elixir-format, fuzzy
 msgid "Edit Role"
-msgstr "Rolle bearbeiten"
+msgstr "Bearbeiten"
 
 #: lib/mv_web/live/role_live/index.ex
 #: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format
+#, elixir-autogen, elixir-format, fuzzy
 msgid "Failed to delete role: %{error}"
-msgstr "Rolle konnte nicht gelöscht werden: %{error}"
+msgstr "Konnte Feld nicht löschen: %{error}"
 
 #: lib/mv_web/live/role_live/index.ex
 #: lib/mv_web/live/role_live/index.html.heex
-#, elixir-autogen, elixir-format
+#, elixir-autogen, elixir-format, fuzzy
 msgid "Listing Roles"
-msgstr "Rollen auflisten"
+msgstr "Benutzer*innen auflisten"
 
 #: lib/mv_web/live/role_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Manage user roles and their permission sets."
-msgstr "Verwalte Benutzer*innen-Rollen und ihre Berechtigungssätze."
+msgstr ""
 
 #: lib/mv_web/live/role_live/index.ex
 #: lib/mv_web/live/role_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Cannot delete role. %{count} user(s) are still assigned to this role. Please assign them to another role first."
-msgstr "Rolle kann nicht gelöscht werden. %{count} Benutzer*in(nen) sind dieser Rolle noch zugeordnet. Bitte weisen Sie sie zunächst einer anderen Rolle zu."
+msgstr ""
 
 #: lib/mv_web/components/layouts/sidebar.ex
 #, elixir-autogen, elixir-format
 msgid "Close sidebar"
-msgstr "Sidebar schließen"
+msgstr ""
 
 #: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format
+#, elixir-autogen, elixir-format, fuzzy
 msgid "Delete Role"
-msgstr "Rolle löschen"
+msgstr "Zyklus löschen"
 
 #: lib/mv_web/components/layouts/sidebar.ex
 #, elixir-autogen, elixir-format
 msgid "Main navigation"
-msgstr "Hauptnavigation"
+msgstr ""
 
 #: lib/mv_web/live/role_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "New Role"
-msgstr "Neue Rolle"
+msgstr ""
 
 #: lib/mv_web/live/role_live/index.html.heex
 #: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format
+#, elixir-autogen, elixir-format, fuzzy
 msgid "No description"
-msgstr "Keine Beschreibung"
+msgstr "Beschreibung"
 
 #: lib/mv_web/components/layouts.ex
 #, elixir-autogen, elixir-format
 msgid "Open navigation menu"
-msgstr "Navigationsmenü öffnen"
+msgstr ""
 
 #: lib/mv_web/live/role_live/form.ex
 #: lib/mv_web/live/role_live/index.html.heex
 #: lib/mv_web/live/role_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Permission Set"
-msgstr "Berechtigungssatz"
+msgstr ""
 
 #: lib/mv_web/components/layouts/sidebar.ex
 #, elixir-autogen, elixir-format, fuzzy
@@ -1957,234 +1962,245 @@ msgstr "Profil"
 #: lib/mv_web/live/role_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Role"
-msgstr "Rolle"
+msgstr ""
 
 #: lib/mv_web/live/role_live/index.ex
 #: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format
+#, elixir-autogen, elixir-format, fuzzy
 msgid "Role deleted successfully."
-msgstr "Rolle erfolgreich gelöscht."
+msgstr "Zyklen erfolgreich regeneriert"
 
 #: lib/mv_web/live/role_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Role details and permissions."
-msgstr "Rollen-Details und Berechtigungen."
+msgstr ""
 
 #: lib/mv_web/live/role_live/form.ex
 #: lib/mv_web/live/role_live/index.ex
 #: lib/mv_web/live/role_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Role not found."
-msgstr "Rolle nicht gefunden."
+msgstr ""
 
 #: lib/mv_web/live/role_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Role saved successfully."
-msgstr "Rolle erfolgreich gespeichert."
+msgstr ""
 
 #: lib/mv_web/live/role_live/form.ex
-#, elixir-autogen, elixir-format
+#, elixir-autogen, elixir-format, fuzzy
 msgid "Save Role"
-msgstr "Rolle speichern"
+msgstr "Speichern"
 
 #: lib/mv_web/live/role_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Select permission set"
-msgstr "Berechtigungssatz auswählen"
+msgstr ""
 
 #: lib/mv_web/live/role_live/show.ex
-#, elixir-autogen, elixir-format
+#, elixir-autogen, elixir-format, fuzzy
 msgid "Show Role"
-msgstr "Rolle anzeigen"
+msgstr "Anzeigen"
 
 #: lib/mv_web/live/role_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "System"
-msgstr "System"
+msgstr ""
 
 #: lib/mv_web/live/role_live/index.html.heex
 #: lib/mv_web/live/role_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "System Role"
-msgstr "System-Rolle"
+msgstr ""
 
 #: lib/mv_web/live/role_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "System roles cannot be deleted"
-msgstr "System-Rollen können nicht gelöscht werden"
+msgstr ""
 
 #: lib/mv_web/live/role_live/index.ex
 #: lib/mv_web/live/role_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "System roles cannot be deleted."
-msgstr "System-Rollen können nicht gelöscht werden."
+msgstr ""
 
 #: lib/mv_web/components/layouts/sidebar.ex
 #, elixir-autogen, elixir-format
 msgid "Toggle sidebar"
-msgstr "Sidebar umschalten"
+msgstr ""
 
 #: lib/mv_web/live/role_live/form.ex
-#, elixir-autogen, elixir-format
+#, elixir-autogen, elixir-format, fuzzy
 msgid "Use this form to manage roles in your database."
-msgstr "Verwenden Sie dieses Formular, um Rollen in Ihrer Datenbank zu verwalten."
+msgstr "Verwenden Sie dieses Formular, um Benutzer*innen-Datensätze zu verwalten."
 
 #: lib/mv_web/components/layouts/sidebar.ex
-#, elixir-autogen, elixir-format
+#, elixir-autogen, elixir-format, fuzzy
 msgid "User menu"
-msgstr "Benutzer*innen-Menü"
+msgstr "Benutzer*in"
 
 #: lib/mv_web/live/role_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "admin - Unrestricted access"
-msgstr "admin - Uneingeschränkter Zugriff"
+msgstr ""
 
 #: lib/mv_web/live/role_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "normal_user - Create/Read/Update access"
-msgstr "normal_user - Erstellen/Lesen/Aktualisieren Zugriff"
+msgstr ""
 
 #: lib/mv_web/live/role_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "own_data - Access only to own data"
-msgstr "own_data - Zugriff nur auf eigene Daten"
+msgstr ""
 
 #: lib/mv_web/live/role_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "read_only - Read access to all data"
-msgstr "read_only - Lesezugriff auf alle Daten"
+msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "You do not have permission to %{action} members."
-msgstr "Sie haben keine Berechtigung, Mitglieder zu %{action}."
+#~ #: lib/mv_web/live/custom_field_live/show.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Auto-generated identifier (immutable)"
+#~ msgstr "Automatisch generierter Bezeichner (unveränderlich)"
 
-#: lib/mv_web/live/member_live/show/membership_fees_component.ex
-#, elixir-autogen, elixir-format
-msgid "Cycle Period"
-msgstr "Zykluszeitraum"
+#~ #: lib/mv_web/live/contribution_settings_live.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Configure global settings for membership contributions."
+#~ msgstr "Globale Einstellungen für Mitgliedsbeiträge konfigurieren."
 
-#: lib/mv_web/live/member_live/show/membership_fees_component.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Delete all cycles"
-msgstr "Alle Zyklen löschen"
+#~ #: lib/mv_web/live/member_live/form.ex
+#~ #: lib/mv_web/live/member_live/show.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Contribution"
+#~ msgstr "Beitrag"
 
-#: lib/mv_web/live/member_live/show/membership_fees_component.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Delete cycle"
-msgstr "Zyklus löschen"
+#~ #: lib/mv_web/components/layouts/navbar.ex
+#~ #: lib/mv_web/live/contribution_settings_live.ex
+#~ #, elixir-autogen, elixir-format, fuzzy
+#~ msgid "Contribution Settings"
+#~ msgstr "Beitragseinstellungen"
 
-#: lib/mv_web/live/member_live/show/membership_fees_component.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "The cycle period will be calculated based on this date and the interval."
-msgstr "Der Zyklus wird basierend auf diesem Datum und dem Intervall berechnet."
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Copy emails"
+#~ msgstr "E-Mails kopieren"
 
-#: lib/mv_web/live/custom_field_value_live/index.ex
-#, elixir-autogen, elixir-format
-msgid "Custom field value deleted successfully"
-msgstr "Benutzerdefinierter Feldwert erfolgreich gelöscht"
+#~ #: lib/mv_web/live/contribution_settings_live.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Default Contribution Type"
+#~ msgstr "Standard-Beitragsart"
 
-#: lib/mv_web/live/custom_field_value_live/index.ex
-#, elixir-autogen, elixir-format
-msgid "Custom field value not found"
-msgstr "Benutzerdefinierter Feldwert nicht gefunden"
+#~ #: lib/mv_web/live/custom_field_live/form_component.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Immutable"
+#~ msgstr "Unveränderlich"
 
-#: lib/mv_web/live/membership_fee_type_live/index.ex
-#, elixir-autogen, elixir-format
-msgid "Membership fee type not found"
-msgstr "Mitgliedsbeitragsart nicht gefunden"
+#~ #: lib/mv_web/live/contribution_settings_live.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Include joining period"
+#~ msgstr "Beitrittsdatum einbeziehen"
 
-#: lib/mv_web/live/user_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "User %{action} successfully"
-msgstr "Benutzer*in wurde erfolgreich %{action}"
+#~ #: lib/mv_web/live/custom_field_live/index_component.ex
+#~ #, elixir-autogen, elixir-format, fuzzy
+#~ msgid "New Custom field"
+#~ msgstr "Benutzerdefiniertes Feld speichern"
 
-#: lib/mv_web/live/user_live/index.ex
-#, elixir-autogen, elixir-format
-msgid "User deleted successfully"
-msgstr "Benutzer*in erfolgreich gelöscht"
+#~ #: lib/mv_web/live/components/payment_filter_component.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Not paid"
+#~ msgstr "Nicht bezahlt"
 
-#: lib/mv_web/live/user_live/index.ex
-#, elixir-autogen, elixir-format
-msgid "User not found"
-msgstr "Benutzer*in nicht gefunden"
+#~ #: lib/mv_web/live/member_live/show.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Payment Cycle"
+#~ msgstr "Zahlungszyklus"
 
-#: lib/mv_web/live/custom_field_value_live/index.ex
-#, elixir-autogen, elixir-format
-msgid "You do not have permission to access this custom field value"
-msgstr "Sie haben keine Berechtigung, auf diesen benutzerdefinierten Feldwert zuzugreifen"
+#~ #: lib/mv_web/live/member_live/show.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Pending"
+#~ msgstr "Ausstehend"
 
-#: lib/mv_web/live/membership_fee_type_live/index.ex
-#, elixir-autogen, elixir-format
-msgid "You do not have permission to access this membership fee type"
-msgstr "Sie haben keine Berechtigung, auf diese Mitgliedsbeitragsart zuzugreifen"
+#~ #: lib/mv_web/live/member_live/form.ex
+#~ #: lib/mv_web/live/member_live/show.ex
+#~ #: lib/mv_web/translations/member_fields.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Phone"
+#~ msgstr "Telefon"
 
-#: lib/mv_web/live/user_live/index.ex
-#, elixir-autogen, elixir-format
-msgid "You do not have permission to access this user"
-msgstr "Sie haben keine Berechtigung, auf diese*n Benutzer*in zuzugreifen"
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Phone Number"
+#~ msgstr "Telefonnummer"
 
-#: lib/mv_web/live/custom_field_value_live/index.ex
-#, elixir-autogen, elixir-format
-msgid "You do not have permission to delete this custom field value"
-msgstr "Sie haben keine Berechtigung, diesen benutzerdefinierten Feldwert zu löschen"
+#~ #: lib/mv_web/live/contribution_settings_live.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Quarterly Interval - Joining Period Excluded"
+#~ msgstr "Vierteljährliches Intervall – Beitrittszeitraum nicht einbezogen"
 
-#: lib/mv_web/live/membership_fee_type_live/index.ex
-#, elixir-autogen, elixir-format
-msgid "You do not have permission to delete this membership fee type"
-msgstr "Sie haben keine Berechtigung, diese Mitgliedsbeitragsart zu löschen"
+#~ #: lib/mv_web/components/layouts/navbar.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Roles"
+#~ msgstr ""
 
-#: lib/mv_web/live/user_live/index.ex
-#, elixir-autogen, elixir-format
-msgid "You do not have permission to delete this user"
-msgstr "Sie haben keine Berechtigung, diese*n Benutzer*in zu löschen"
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Show Last/Current Cycle Payment Status"
+#~ msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "created"
-msgstr "erstellt"
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Show current cycle"
+#~ msgstr "Aktuellen Zyklus anzeigen"
 
-#: lib/mv_web/live/user_live/form.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "updated"
-msgstr "aktualisiert"
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Show last completed cycle"
+#~ msgstr "Letzten abgeschlossenen Zyklus anzeigen"
 
-#: lib/mv_web/live/user_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "Unknown error"
-msgstr "Unbekannter Fehler"
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Switch to current cycle"
+#~ msgstr "Zum aktuellen Zyklus wechseln"
 
-#: lib/mv_web/live/member_live/index.ex
-#, elixir-autogen, elixir-format
-msgid "Member deleted successfully"
-msgstr "Mitglied wurde erfolgreich gelöscht"
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Switch to last completed cycle"
+#~ msgstr "Zum letzten abgeschlossenen Zyklus wechseln"
 
-#: lib/mv_web/live/member_live/index.ex
-#, elixir-autogen, elixir-format
-msgid "Member not found"
-msgstr "Mitglied nicht gefunden"
+#~ #: lib/mv_web/live/member_live/form.ex
+#~ #: lib/mv_web/live/member_live/show.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "This data is for demonstration purposes only (mockup)."
+#~ msgstr "Diese Daten dienen nur zu Demonstrationszwecken (Mockup)."
 
-#: lib/mv_web/live/member_live/index.ex
-#, elixir-autogen, elixir-format
-msgid "You do not have permission to access this member"
-msgstr "Sie haben keine Berechtigung, auf dieses Mitglied zuzugreifen"
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Unpaid in current cycle"
+#~ msgstr "Unbezahlt im aktuellen Zyklus"
 
-#: lib/mv_web/live/member_live/index.ex
-#, elixir-autogen, elixir-format
-msgid "You do not have permission to delete this member"
-msgstr "Sie haben keine Berechtigung, dieses Mitglied zu löschen"
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Unpaid in last cycle"
+#~ msgstr "Unbezahlt im letzten Zyklus"
 
-#: lib/mv_web/live/custom_field_value_live/index.ex
-#, elixir-autogen, elixir-format
-msgid "You do not have permission to view custom field values"
-msgstr "Sie haben keine Berechtigung, benutzerdefinierte Feldwerte anzuzeigen"
+#~ #: lib/mv_web/live/contribution_settings_live.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "View Example Member"
+#~ msgstr "Beispielmitglied anzeigen"
 
-#: lib/mv_web/live/member_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "Member created successfully"
-msgstr "Mitglied wurde erfolgreich erstellt"
+#~ #: lib/mv_web/live/contribution_settings_live.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Yearly Interval - Joining Period Included"
+#~ msgstr "Jährliches Intervall – Beitrittszeitraum einbezogen"
 
-#: lib/mv_web/live/member_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "Member updated successfully"
-msgstr "Mitglied wurde erfolgreich aktualisiert"
+#~ #: lib/mv_web/live/member_live/form.ex
+#~ #: lib/mv_web/live/member_live/show.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "monthly"
+#~ msgstr "monatlich"
+
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "yearly"
+#~ msgstr "jährlich"
diff --git a/priv/gettext/de/LC_MESSAGES/errors.po b/priv/gettext/de/LC_MESSAGES/errors.po
index b1d359a..92d3048 100644
--- a/priv/gettext/de/LC_MESSAGES/errors.po
+++ b/priv/gettext/de/LC_MESSAGES/errors.po
@@ -8,7 +8,7 @@
 ## to merge POT files into PO files.
 msgid ""
 msgstr ""
-"Language: de\n"
+"Language: en\n"
 
 ## From Ecto.Changeset.cast/4
 msgid "can't be blank"
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index 4124d86..f7f0f0e 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -1827,6 +1827,11 @@ msgstr ""
 msgid "Show/Hide Columns"
 msgstr ""
 
+#: lib/mv_web/live/member_live/show/membership_fees_component.ex
+#, elixir-autogen, elixir-format
+msgid "The cycle will be calculated based on this date and the interval."
+msgstr ""
+
 #: lib/mv_web/live/custom_field_live/form_component.ex
 #, elixir-autogen, elixir-format
 msgid "Back to settings"
@@ -2054,138 +2059,3 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "read_only - Read access to all data"
 msgstr ""
-
-#: lib/mv_web/live/member_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "You do not have permission to %{action} members."
-msgstr ""
-
-#: lib/mv_web/live/member_live/show/membership_fees_component.ex
-#, elixir-autogen, elixir-format
-msgid "Cycle Period"
-msgstr ""
-
-#: lib/mv_web/live/member_live/show/membership_fees_component.ex
-#, elixir-autogen, elixir-format
-msgid "Delete all cycles"
-msgstr ""
-
-#: lib/mv_web/live/member_live/show/membership_fees_component.ex
-#, elixir-autogen, elixir-format
-msgid "Delete cycle"
-msgstr ""
-
-#: lib/mv_web/live/member_live/show/membership_fees_component.ex
-#, elixir-autogen, elixir-format
-msgid "The cycle period will be calculated based on this date and the interval."
-msgstr ""
-
-#: lib/mv_web/live/custom_field_value_live/index.ex
-#, elixir-autogen, elixir-format
-msgid "Custom field value deleted successfully"
-msgstr ""
-
-#: lib/mv_web/live/custom_field_value_live/index.ex
-#, elixir-autogen, elixir-format
-msgid "Custom field value not found"
-msgstr ""
-
-#: lib/mv_web/live/membership_fee_type_live/index.ex
-#, elixir-autogen, elixir-format
-msgid "Membership fee type not found"
-msgstr ""
-
-#: lib/mv_web/live/user_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "User %{action} successfully"
-msgstr ""
-
-#: lib/mv_web/live/user_live/index.ex
-#, elixir-autogen, elixir-format
-msgid "User deleted successfully"
-msgstr ""
-
-#: lib/mv_web/live/user_live/index.ex
-#, elixir-autogen, elixir-format
-msgid "User not found"
-msgstr ""
-
-#: lib/mv_web/live/custom_field_value_live/index.ex
-#, elixir-autogen, elixir-format
-msgid "You do not have permission to access this custom field value"
-msgstr ""
-
-#: lib/mv_web/live/membership_fee_type_live/index.ex
-#, elixir-autogen, elixir-format
-msgid "You do not have permission to access this membership fee type"
-msgstr ""
-
-#: lib/mv_web/live/user_live/index.ex
-#, elixir-autogen, elixir-format
-msgid "You do not have permission to access this user"
-msgstr ""
-
-#: lib/mv_web/live/custom_field_value_live/index.ex
-#, elixir-autogen, elixir-format
-msgid "You do not have permission to delete this custom field value"
-msgstr ""
-
-#: lib/mv_web/live/membership_fee_type_live/index.ex
-#, elixir-autogen, elixir-format
-msgid "You do not have permission to delete this membership fee type"
-msgstr ""
-
-#: lib/mv_web/live/user_live/index.ex
-#, elixir-autogen, elixir-format
-msgid "You do not have permission to delete this user"
-msgstr ""
-
-#: lib/mv_web/live/user_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "created"
-msgstr ""
-
-#: lib/mv_web/live/user_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "updated"
-msgstr ""
-
-#: lib/mv_web/live/user_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "Unknown error"
-msgstr ""
-
-#: lib/mv_web/live/member_live/index.ex
-#, elixir-autogen, elixir-format
-msgid "Member deleted successfully"
-msgstr ""
-
-#: lib/mv_web/live/member_live/index.ex
-#, elixir-autogen, elixir-format
-msgid "Member not found"
-msgstr ""
-
-#: lib/mv_web/live/member_live/index.ex
-#, elixir-autogen, elixir-format
-msgid "You do not have permission to access this member"
-msgstr ""
-
-#: lib/mv_web/live/member_live/index.ex
-#, elixir-autogen, elixir-format
-msgid "You do not have permission to delete this member"
-msgstr ""
-
-#: lib/mv_web/live/custom_field_value_live/index.ex
-#, elixir-autogen, elixir-format
-msgid "You do not have permission to view custom field values"
-msgstr ""
-
-#: lib/mv_web/live/member_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "Member created successfully"
-msgstr ""
-
-#: lib/mv_web/live/member_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "Member updated successfully"
-msgstr ""
diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po
index 50c5440..034392e 100644
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -219,14 +219,14 @@ msgstr ""
 #: lib/mv_web/live/member_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "create"
-msgstr ""
+msgstr "created"
 
 #: lib/mv_web/live/custom_field_live/form_component.ex
 #: lib/mv_web/live/custom_field_value_live/form.ex
 #: lib/mv_web/live/member_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "update"
-msgstr ""
+msgstr "updated"
 
 #: lib/mv_web/controllers/auth_controller.ex
 #, elixir-autogen, elixir-format
@@ -455,12 +455,12 @@ msgstr ""
 #: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "As an administrator, you can directly set a new password for this user using the same secure Ash Authentication system."
-msgstr ""
+msgstr "As an administrator, you can directly set a new password for this user using the same secure Ash Authentication system."
 
 #: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "At least 8 characters"
-msgstr ""
+msgstr "At least 8 characters"
 
 #: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
@@ -470,32 +470,32 @@ msgstr ""
 #: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Check 'Change Password' above to set a new password for this user."
-msgstr ""
+msgstr "Check 'Change Password' above to set a new password for this user."
 
 #: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Confirm Password"
-msgstr ""
+msgstr "Confirm Password"
 
 #: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Consider using special characters"
-msgstr ""
+msgstr "Consider using special characters"
 
 #: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Include both letters and numbers"
-msgstr ""
+msgstr "Include both letters and numbers"
 
 #: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Password"
-msgstr ""
+msgstr "Password"
 
 #: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Password requirements"
-msgstr ""
+msgstr "Password requirements"
 
 #: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format, fuzzy
@@ -510,12 +510,12 @@ msgstr ""
 #: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Set Password"
-msgstr ""
+msgstr "Set Password"
 
 #: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "User will be created without a password. Check 'Set Password' to add one."
-msgstr ""
+msgstr "User will be created without a password. Check 'Set Password' to add one."
 
 #: lib/mv_web/live/user_live/form.ex
 #: lib/mv_web/live/user_live/index.html.heex
@@ -1393,7 +1393,7 @@ msgstr ""
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Create"
-msgstr ""
+msgstr "created"
 
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
 #, elixir-autogen, elixir-format, fuzzy
@@ -1413,7 +1413,7 @@ msgstr ""
 #: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Current Cycle Payment Status"
-msgstr ""
+msgstr "Current Cycle Payment Status"
 
 #: lib/mv_web/live/membership_fee_type_live/form.ex
 #, elixir-autogen, elixir-format, fuzzy
@@ -1538,7 +1538,7 @@ msgstr ""
 #: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Last Cycle Payment Status"
-msgstr ""
+msgstr "Last Cycle Payment Status"
 
 #: lib/mv_web/live/membership_fee_type_live/index.ex
 #, elixir-autogen, elixir-format
@@ -1827,6 +1827,11 @@ msgstr ""
 msgid "Show/Hide Columns"
 msgstr ""
 
+#: lib/mv_web/live/member_live/show/membership_fees_component.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "The cycle will be calculated based on this date and the interval."
+msgstr ""
+
 #: lib/mv_web/live/custom_field_live/form_component.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Back to settings"
@@ -2055,137 +2060,158 @@ msgstr ""
 msgid "read_only - Read access to all data"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "You do not have permission to %{action} members."
-msgstr ""
+#~ #: lib/mv_web/live/components/payment_filter_component.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "All payment statuses"
+#~ msgstr ""
 
-#: lib/mv_web/live/member_live/show/membership_fees_component.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Cycle Period"
-msgstr ""
+#~ #: lib/mv_web/live/contribution_settings_live.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Configure global settings for membership contributions."
+#~ msgstr ""
 
-#: lib/mv_web/live/member_live/show/membership_fees_component.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Delete all cycles"
-msgstr ""
+#~ #: lib/mv_web/live/member_live/form.ex
+#~ #: lib/mv_web/live/member_live/show.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Contribution"
+#~ msgstr ""
 
-#: lib/mv_web/live/member_live/show/membership_fees_component.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Delete cycle"
-msgstr ""
+#~ #: lib/mv_web/components/layouts/navbar.ex
+#~ #: lib/mv_web/live/contribution_settings_live.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Contribution Settings"
+#~ msgstr ""
 
-#: lib/mv_web/live/member_live/show/membership_fees_component.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "The cycle period will be calculated based on this date and the interval."
-msgstr ""
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Example: Member Contribution View"
+#~ msgstr ""
 
-#: lib/mv_web/live/custom_field_value_live/index.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Custom field value deleted successfully"
-msgstr ""
+#~ #: lib/mv_web/live/membership_fee_settings_live.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Failed to save settings. Please check the errors below."
+#~ msgstr ""
 
-#: lib/mv_web/live/custom_field_value_live/index.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Custom field value not found"
-msgstr ""
+#~ #: lib/mv_web/live/global_settings_live.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Failed to update member field visibility: %{error}"
+#~ msgstr ""
 
-#: lib/mv_web/live/membership_fee_type_live/index.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Membership fee type not found"
-msgstr ""
+#~ #: lib/mv_web/live/user_live/index.html.heex
+#~ #: lib/mv_web/live/user_live/show.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Generated periods"
+#~ msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "User %{action} successfully"
-msgstr ""
+#~ #: lib/mv_web/live/custom_field_live/form_component.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Immutable"
+#~ msgstr ""
 
-#: lib/mv_web/live/user_live/index.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "User deleted successfully"
-msgstr ""
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Not paid"
+#~ msgstr ""
 
-#: lib/mv_web/live/user_live/index.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "User not found"
-msgstr ""
+#~ #: lib/mv_web/live/member_live/show.ex
+#~ #, elixir-autogen, elixir-format, fuzzy
+#~ msgid "Payment Cycle"
+#~ msgstr ""
 
-#: lib/mv_web/live/custom_field_value_live/index.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "You do not have permission to access this custom field value"
-msgstr ""
+#~ #: lib/mv_web/live/member_live/show.ex
+#~ #, elixir-autogen, elixir-format, fuzzy
+#~ msgid "Pending"
+#~ msgstr ""
 
-#: lib/mv_web/live/membership_fee_type_live/index.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "You do not have permission to access this membership fee type"
-msgstr ""
+#~ #: lib/mv_web/live/member_live/form.ex
+#~ #: lib/mv_web/live/member_live/show.ex
+#~ #: lib/mv_web/translations/member_fields.ex
+#~ #, elixir-autogen, elixir-format, fuzzy
+#~ msgid "Phone"
+#~ msgstr ""
 
-#: lib/mv_web/live/user_live/index.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "You do not have permission to access this user"
-msgstr ""
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Phone Number"
+#~ msgstr ""
 
-#: lib/mv_web/live/custom_field_value_live/index.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "You do not have permission to delete this custom field value"
-msgstr ""
+#~ #: lib/mv_web/live/contribution_settings_live.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Quarterly Interval - Joining Period Excluded"
+#~ msgstr ""
 
-#: lib/mv_web/live/membership_fee_type_live/index.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "You do not have permission to delete this membership fee type"
-msgstr ""
+#~ #: lib/mv_web/components/layouts/navbar.ex
+#~ #, elixir-autogen, elixir-format, fuzzy
+#~ msgid "Roles"
+#~ msgstr ""
 
-#: lib/mv_web/live/user_live/index.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "You do not have permission to delete this user"
-msgstr ""
+#~ #: lib/mv_web/live/custom_field_live/form_component.ex
+#~ #, elixir-autogen, elixir-format, fuzzy
+#~ msgid "Save Custom Field"
+#~ msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "created"
-msgstr ""
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Show Last/Current Cycle Payment Status"
+#~ msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "updated"
-msgstr ""
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Show current cycle"
+#~ msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "Unknown error"
-msgstr ""
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Show last completed cycle"
+#~ msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex
-#, elixir-autogen, elixir-format
-msgid "Member deleted successfully"
-msgstr ""
+#~ #: lib/mv_web/live/member_field_live/form_component.ex
+#~ #: lib/mv_web/live/member_field_live/index_component.ex
+#~ #, elixir-autogen, elixir-format, fuzzy
+#~ msgid "String"
+#~ msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex
-#, elixir-autogen, elixir-format
-msgid "Member not found"
-msgstr ""
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Switch to current cycle"
+#~ msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex
-#, elixir-autogen, elixir-format
-msgid "You do not have permission to access this member"
-msgstr ""
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Switch to last completed cycle"
+#~ msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex
-#, elixir-autogen, elixir-format
-msgid "You do not have permission to delete this member"
-msgstr ""
+#~ #: lib/mv_web/live/member_live/form.ex
+#~ #: lib/mv_web/live/member_live/show.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "This data is for demonstration purposes only (mockup)."
+#~ msgstr ""
 
-#: lib/mv_web/live/custom_field_value_live/index.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "You do not have permission to view custom field values"
-msgstr ""
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Unpaid in current cycle"
+#~ msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "Member created successfully"
-msgstr "Member created successfully"
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Unpaid in last cycle"
+#~ msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "Member updated successfully"
-msgstr "Member updated successfully"
+#~ #: lib/mv_web/live/contribution_settings_live.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "View Example Member"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/contribution_settings_live.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Yearly Interval - Joining Period Included"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/member_live/form.ex
+#~ #: lib/mv_web/live/member_live/show.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "monthly"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/member_live/form.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "yearly"
+#~ msgstr ""
diff --git a/priv/repo/seeds.exs b/priv/repo/seeds.exs
index b89ba3c..3fb2bad 100644
--- a/priv/repo/seeds.exs
+++ b/priv/repo/seeds.exs
@@ -162,17 +162,6 @@ if admin_role do
   |> Ash.update!()
 end
 
-# Load admin user with role for use as actor in member operations
-# This ensures all member operations have proper authorization
-# If admin role creation failed, we cannot proceed with member operations
-admin_user_with_role =
-  if admin_role do
-    admin_user
-    |> Ash.load!(:role)
-  else
-    raise "Failed to create or find admin role. Cannot proceed with member seeding."
-  end
-
 # Load all membership fee types for assignment
 # Sort by name to ensure deterministic order
 all_fee_types =
@@ -247,8 +236,7 @@ Enum.each(member_attrs_list, fn member_attrs ->
   member =
     Membership.create_member!(member_attrs_without_fee_type,
       upsert?: true,
-      upsert_identity: :unique_email,
-      actor: admin_user_with_role
+      upsert_identity: :unique_email
     )
 
   # Only set membership_fee_type_id if member doesn't have one yet (idempotent)
@@ -259,8 +247,7 @@ Enum.each(member_attrs_list, fn member_attrs ->
       |> Ash.Changeset.for_update(:update_member, %{
         membership_fee_type_id: member_attrs_without_status.membership_fee_type_id
       })
-      |> Ash.Changeset.put_context(:actor, admin_user_with_role)
-      |> Ash.update!(actor: admin_user_with_role)
+      |> Ash.update!()
     else
       member
     end
@@ -277,10 +264,7 @@ Enum.each(member_attrs_list, fn member_attrs ->
       if Enum.empty?(member_with_cycles.membership_fee_cycles) do
         # Generate cycles
         {:ok, new_cycles, _notifications} =
-          CycleGenerator.generate_cycles_for_member(final_member.id,
-            skip_lock?: true,
-            actor: admin_user_with_role
-          )
+          CycleGenerator.generate_cycles_for_member(final_member.id, skip_lock?: true)
 
         new_cycles
       else
@@ -315,7 +299,7 @@ Enum.each(member_attrs_list, fn member_attrs ->
         if cycle.status != status do
           cycle
           |> Ash.Changeset.for_update(:update, %{status: status})
-          |> Ash.update!(actor: admin_user_with_role)
+          |> Ash.update!()
         end
       end)
     end
@@ -387,15 +371,13 @@ Enum.with_index(linked_members)
       Membership.create_member!(
         Map.put(member_attrs_without_fee_type, :user, %{id: user.id}),
         upsert?: true,
-        upsert_identity: :unique_email,
-        actor: admin_user_with_role
+        upsert_identity: :unique_email
       )
     else
       # User already has a member, just create the member without linking - use upsert to prevent duplicates
       Membership.create_member!(member_attrs_without_fee_type,
         upsert?: true,
-        upsert_identity: :unique_email,
-        actor: admin_user_with_role
+        upsert_identity: :unique_email
       )
     end
 
@@ -409,7 +391,7 @@ Enum.with_index(linked_members)
 
       member
       |> Ash.Changeset.for_update(:update_member, %{membership_fee_type_id: fee_type.id})
-      |> Ash.update!(actor: admin_user_with_role)
+      |> Ash.update!()
     else
       member
     end
@@ -426,10 +408,7 @@ Enum.with_index(linked_members)
       if Enum.empty?(member_with_cycles.membership_fee_cycles) do
         # Generate cycles
         {:ok, new_cycles, _notifications} =
-          CycleGenerator.generate_cycles_for_member(final_member.id,
-            skip_lock?: true,
-            actor: admin_user_with_role
-          )
+          CycleGenerator.generate_cycles_for_member(final_member.id, skip_lock?: true)
 
         new_cycles
       else
@@ -456,7 +435,7 @@ Enum.with_index(linked_members)
 end)
 
 # Create sample custom field values for some members
-all_members = Ash.read!(Membership.Member, actor: admin_user_with_role)
+all_members = Ash.read!(Membership.Member)
 all_custom_fields = Ash.read!(Membership.CustomField)
 
 # Helper function to find custom field by name
@@ -484,11 +463,7 @@ if hans = find_member.("hans.mueller@example.de") do
         custom_field_id: field.id,
         value: value
       })
-      |> Ash.create!(
-        upsert?: true,
-        upsert_identity: :unique_custom_field_per_member,
-        actor: admin_user_with_role
-      )
+      |> Ash.create!(upsert?: true, upsert_identity: :unique_custom_field_per_member)
     end
   end)
 end
@@ -513,11 +488,7 @@ if greta = find_member.("greta.schmidt@example.de") do
         custom_field_id: field.id,
         value: value
       })
-      |> Ash.create!(
-        upsert?: true,
-        upsert_identity: :unique_custom_field_per_member,
-        actor: admin_user_with_role
-      )
+      |> Ash.create!(upsert?: true, upsert_identity: :unique_custom_field_per_member)
     end
   end)
 end
@@ -543,11 +514,7 @@ if friedrich = find_member.("friedrich.wagner@example.de") do
         custom_field_id: field.id,
         value: value
       })
-      |> Ash.create!(
-        upsert?: true,
-        upsert_identity: :unique_custom_field_per_member,
-        actor: admin_user_with_role
-      )
+      |> Ash.create!(upsert?: true, upsert_identity: :unique_custom_field_per_member)
     end
   end)
 end
diff --git a/priv/static/templates/member_import_de.csv b/priv/static/templates/member_import_de.csv
deleted file mode 100644
index 3bcbeb5..0000000
--- a/priv/static/templates/member_import_de.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-Vorname;Nachname;E-Mail;Straße;PLZ;Stadt
-Max;Mustermann;max.mustermann@example.com;Hauptstraße;10115;Berlin
diff --git a/priv/static/templates/member_import_en.csv b/priv/static/templates/member_import_en.csv
deleted file mode 100644
index d4e67f3..0000000
--- a/priv/static/templates/member_import_en.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-first_name;last_name;email;street;postal_code;city
-John;Doe;john.doe@example.com;Main Street;12345;Berlin
diff --git a/test/mv/authorization/checks/has_permission_fail_closed_test.exs b/test/mv/authorization/checks/has_permission_fail_closed_test.exs
deleted file mode 100644
index 822e5aa..0000000
--- a/test/mv/authorization/checks/has_permission_fail_closed_test.exs
+++ /dev/null
@@ -1,44 +0,0 @@
-defmodule Mv.Authorization.Checks.HasPermissionFailClosedTest do
-  @moduledoc """
-  Regression tests to ensure deny-filter behavior is fail-closed (matches no records).
-
-  These tests verify that when HasPermission.auto_filter returns a deny-filter
-  (e.g., when actor is nil or no permission is found), the filter actually
-  matches zero records in the database.
-
-  This prevents regressions like the previous bug where [id: {:not, {:in, []}}]
-  was used, which logically evaluates to "NOT (id IN [])" = true for all IDs,
-  effectively allowing all records instead of denying them.
-  """
-  use Mv.DataCase, async: true
-
-  alias Mv.Authorization.Checks.HasPermission
-
-  import Mv.Fixtures
-
-  test "auto_filter deny-filter matches no records (regression for NOT IN [] allow-all bug)" do
-    # Arrange: create some members in DB
-    _m1 = member_fixture()
-    _m2 = member_fixture()
-
-    # Build a minimal authorizer with a stable action type (:read)
-    authorizer = %Ash.Policy.Authorizer{
-      resource: Mv.Membership.Member,
-      action: %{type: :read}
-    }
-
-    # Act: missing actor must yield a deny-all filter (fail-closed)
-    deny_filter = HasPermission.auto_filter(nil, authorizer, [])
-
-    # Apply the returned filter to a real DB query (no authorization involved)
-    query =
-      Mv.Membership.Member
-      |> Ash.Query.new()
-      |> Ash.Query.filter_input(deny_filter)
-
-    {:ok, results} = Ash.read(query, domain: Mv.Membership, authorize?: false)
-
-    # Assert: deny-filter must match nothing
-    assert results == []
-  end
-end
diff --git a/test/mv/authorization/checks/has_permission_integration_test.exs b/test/mv/authorization/checks/has_permission_integration_test.exs
index 9ef5fd2..f1f32c3 100644
--- a/test/mv/authorization/checks/has_permission_integration_test.exs
+++ b/test/mv/authorization/checks/has_permission_integration_test.exs
@@ -14,22 +14,16 @@ defmodule Mv.Authorization.Checks.HasPermissionIntegrationTest do
   alias Mv.Authorization.Checks.HasPermission
 
   # Helper to create mock actor with role
-  defp create_actor_with_role(permission_set_name, opts \\ []) do
-    actor = %{
+  defp create_actor_with_role(permission_set_name) do
+    %{
       id: "user-#{System.unique_integer([:positive])}",
       role: %{permission_set_name: permission_set_name}
     }
-
-    # Add member_id if provided (needed for :linked scope tests)
-    case Keyword.get(opts, :member_id) do
-      nil -> actor
-      member_id -> Map.put(actor, :member_id, member_id)
-    end
   end
 
   describe "Filter Expression Structure - :linked scope" do
-    test "Member filter uses actor.member_id (inverse relationship)" do
-      actor = create_actor_with_role("own_data", member_id: "member-123")
+    test "Member filter uses user.id relationship path" do
+      actor = create_actor_with_role("own_data")
       authorizer = create_authorizer(Mv.Membership.Member, :read)
 
       filter = HasPermission.auto_filter(actor, authorizer, [])
@@ -42,8 +36,8 @@ defmodule Mv.Authorization.Checks.HasPermissionIntegrationTest do
       assert is_list(filter) or is_map(filter)
     end
 
-    test "CustomFieldValue filter uses actor.member_id (via member relationship)" do
-      actor = create_actor_with_role("own_data", member_id: "member-123")
+    test "CustomFieldValue filter uses member.user.id relationship path" do
+      actor = create_actor_with_role("own_data")
       authorizer = create_authorizer(Mv.Membership.CustomFieldValue, :read)
 
       filter = HasPermission.auto_filter(actor, authorizer, [])
@@ -72,15 +66,14 @@ defmodule Mv.Authorization.Checks.HasPermissionIntegrationTest do
   end
 
   describe "Filter Expression Structure - :all scope" do
-    test "Admin can read all members without filter (returns expr(true))" do
+    test "Admin can read all members without filter" do
       actor = create_actor_with_role("admin")
       authorizer = create_authorizer(Mv.Membership.Member, :read)
 
       filter = HasPermission.auto_filter(actor, authorizer, [])
 
-      # :all scope should return [] (empty keyword list = no filter = allow all records)
-      # After auto_filter fix: no longer returns nil, returns [] instead
-      assert filter == []
+      # :all scope should return nil (no filter needed)
+      assert is_nil(filter)
     end
   end
 
@@ -88,10 +81,7 @@ defmodule Mv.Authorization.Checks.HasPermissionIntegrationTest do
   defp create_authorizer(resource, action) do
     %Ash.Policy.Authorizer{
       resource: resource,
-      subject: %{
-        action: %{type: action},
-        data: nil
-      }
+      subject: %{action: %{name: action}}
     }
   end
 end
diff --git a/test/mv/authorization/checks/has_permission_test.exs b/test/mv/authorization/checks/has_permission_test.exs
index f577d03..5ab88c6 100644
--- a/test/mv/authorization/checks/has_permission_test.exs
+++ b/test/mv/authorization/checks/has_permission_test.exs
@@ -13,25 +13,16 @@ defmodule Mv.Authorization.Checks.HasPermissionTest do
   defp create_authorizer(resource, action) do
     %Ash.Policy.Authorizer{
       resource: resource,
-      subject: %{
-        action: %{type: action},
-        data: nil
-      }
+      subject: %{action: %{name: action}}
     }
   end
 
   # Helper to create actor with role
-  defp create_actor(id, permission_set_name, opts \\ []) do
-    actor = %{
+  defp create_actor(id, permission_set_name) do
+    %{
       id: id,
       role: %{permission_set_name: permission_set_name}
     }
-
-    # Add member_id if provided (needed for :linked scope tests)
-    case Keyword.get(opts, :member_id) do
-      nil -> actor
-      member_id -> Map.put(actor, :member_id, member_id)
-    end
   end
 
   describe "describe/1" do
@@ -129,7 +120,7 @@ defmodule Mv.Authorization.Checks.HasPermissionTest do
 
   describe "auto_filter/3 - Scope :linked" do
     test "scope :linked for Member returns user_id filter" do
-      user = create_actor("user-123", "own_data", member_id: "member-456")
+      user = create_actor("user-123", "own_data")
       authorizer = create_authorizer(Mv.Membership.Member, :read)
 
       filter = HasPermission.auto_filter(user, authorizer, [])
@@ -139,7 +130,7 @@ defmodule Mv.Authorization.Checks.HasPermissionTest do
     end
 
     test "scope :linked for CustomFieldValue returns member.user_id filter" do
-      user = create_actor("user-123", "own_data", member_id: "member-456")
+      user = create_actor("user-123", "own_data")
       authorizer = create_authorizer(Mv.Membership.CustomFieldValue, :update)
 
       filter = HasPermission.auto_filter(user, authorizer, [])
diff --git a/test/mv/membership/member_policies_test.exs b/test/mv/membership/member_policies_test.exs
deleted file mode 100644
index 69b0e22..0000000
--- a/test/mv/membership/member_policies_test.exs
+++ /dev/null
@@ -1,430 +0,0 @@
-defmodule Mv.Membership.MemberPoliciesTest do
-  @moduledoc """
-  Tests for Member resource authorization policies.
-
-  Tests all 4 permission sets (own_data, read_only, normal_user, admin)
-  and verifies that policies correctly enforce access control based on
-  user roles and permission sets.
-  """
-  # async: false because we need database commits to be visible across queries
-  # in the same test (especially for unlinked members)
-  use Mv.DataCase, async: false
-
-  alias Mv.Membership
-  alias Mv.Accounts
-  alias Mv.Authorization
-
-  require Ash.Query
-
-  # Helper to create a role with a specific permission set
-  defp create_role_with_permission_set(permission_set_name) do
-    role_name = "Test Role #{permission_set_name} #{System.unique_integer([:positive])}"
-
-    case Authorization.create_role(%{
-           name: role_name,
-           description: "Test role for #{permission_set_name}",
-           permission_set_name: permission_set_name
-         }) do
-      {:ok, role} -> role
-      {:error, error} -> raise "Failed to create role: #{inspect(error)}"
-    end
-  end
-
-  # Helper to create a user with a specific permission set
-  # Returns user with role preloaded (required for authorization)
-  defp create_user_with_permission_set(permission_set_name) do
-    # Create role with permission set
-    role = create_role_with_permission_set(permission_set_name)
-
-    # Create user
-    {:ok, user} =
-      Accounts.User
-      |> Ash.Changeset.for_create(:register_with_password, %{
-        email: "user#{System.unique_integer([:positive])}@example.com",
-        password: "testpassword123"
-      })
-      |> Ash.create()
-
-    # Assign role to user
-    {:ok, user} =
-      user
-      |> Ash.Changeset.for_update(:update, %{})
-      |> Ash.Changeset.manage_relationship(:role, role, type: :append_and_remove)
-      |> Ash.update()
-
-    # Reload user with role preloaded (critical for authorization!)
-    {:ok, user_with_role} = Ash.load(user, :role, domain: Mv.Accounts)
-    user_with_role
-  end
-
-  # Helper to create an admin user (for creating test fixtures)
-  defp create_admin_user do
-    create_user_with_permission_set("admin")
-  end
-
-  # Helper to create a member linked to a user
-  defp create_linked_member_for_user(user) do
-    admin = create_admin_user()
-
-    # Create member
-    # NOTE: We need to ensure the member is actually persisted to the database
-    # before we try to link it. Ash may delay writes, so we explicitly return the struct.
-    {:ok, member} =
-      Membership.Member
-      |> Ash.Changeset.for_create(:create_member, %{
-        first_name: "Linked",
-        last_name: "Member",
-        email: "linked#{System.unique_integer([:positive])}@example.com"
-      })
-      |> Ash.create(actor: admin, return_notifications?: false)
-
-    # Link member to user (User.member_id = member.id)
-    # We use force_change_attribute because the member already exists and we just
-    # need to set the foreign key. This avoids the issue where manage_relationship
-    # tries to query the member without the actor context.
-    result =
-      user
-      |> Ash.Changeset.for_update(:update, %{})
-      |> Ash.Changeset.force_change_attribute(:member_id, member.id)
-      |> Ash.update(actor: admin, domain: Mv.Accounts, return_notifications?: false)
-
-    {:ok, _user} = result
-
-    # Return the member struct directly - no need to reload since we just created it
-    # and we're in the same transaction/sandbox
-    member
-  end
-
-  # Helper to create an unlinked member (no user relationship)
-  defp create_unlinked_member do
-    admin = create_admin_user()
-
-    {:ok, member} =
-      Membership.Member
-      |> Ash.Changeset.for_create(:create_member, %{
-        first_name: "Unlinked",
-        last_name: "Member",
-        email: "unlinked#{System.unique_integer([:positive])}@example.com"
-      })
-      |> Ash.create(actor: admin)
-
-    member
-  end
-
-  describe "own_data permission set (Mitglied)" do
-    setup do
-      user = create_user_with_permission_set("own_data")
-      linked_member = create_linked_member_for_user(user)
-      unlinked_member = create_unlinked_member()
-
-      # Reload user to get updated member_id
-      {:ok, user} = Ash.get(Accounts.User, user.id, domain: Mv.Accounts, load: [:role])
-      {:ok, user} = Ash.load(user, :member, domain: Mv.Accounts)
-
-      %{user: user, linked_member: linked_member, unlinked_member: unlinked_member}
-    end
-
-    test "can read linked member", %{user: user, linked_member: linked_member} do
-      {:ok, member} =
-        Ash.get(Membership.Member, linked_member.id, actor: user, domain: Mv.Membership)
-
-      assert member.id == linked_member.id
-    end
-
-    test "can update linked member", %{user: user, linked_member: linked_member} do
-      # Update is allowed via HasPermission check with :linked scope (not via special case)
-      # The special case policy only applies to :read actions
-      {:ok, updated_member} =
-        linked_member
-        |> Ash.Changeset.for_update(:update_member, %{first_name: "Updated"})
-        |> Ash.update(actor: user)
-
-      assert updated_member.first_name == "Updated"
-    end
-
-    test "cannot read unlinked member (returns forbidden)", %{
-      user: user,
-      unlinked_member: unlinked_member
-    } do
-      # Note: With auto_filter policies, when a user tries to read a member that doesn't
-      # match the filter (id == actor.member_id), Ash returns NotFound, not Forbidden.
-      # This is the expected behavior - the filter makes the record "invisible" to the user.
-      assert_raise Ash.Error.Invalid, fn ->
-        Ash.get!(Membership.Member, unlinked_member.id, actor: user, domain: Mv.Membership)
-      end
-    end
-
-    test "cannot update unlinked member (returns forbidden)", %{
-      user: user,
-      unlinked_member: unlinked_member
-    } do
-      assert_raise Ash.Error.Forbidden, fn ->
-        unlinked_member
-        |> Ash.Changeset.for_update(:update_member, %{first_name: "Updated"})
-        |> Ash.update!(actor: user)
-      end
-    end
-
-    test "list members returns only linked member", %{user: user, linked_member: linked_member} do
-      {:ok, members} = Ash.read(Membership.Member, actor: user, domain: Mv.Membership)
-
-      # Should only return the linked member (scope :linked filters)
-      assert length(members) == 1
-      assert hd(members).id == linked_member.id
-    end
-
-    test "cannot create member (returns forbidden)", %{user: user} do
-      assert_raise Ash.Error.Forbidden, fn ->
-        Membership.Member
-        |> Ash.Changeset.for_create(:create_member, %{
-          first_name: "New",
-          last_name: "Member",
-          email: "new#{System.unique_integer([:positive])}@example.com"
-        })
-        |> Ash.create!(actor: user)
-      end
-    end
-
-    test "cannot destroy member (returns forbidden)", %{user: user, linked_member: linked_member} do
-      assert_raise Ash.Error.Forbidden, fn ->
-        Ash.destroy!(linked_member, actor: user)
-      end
-    end
-  end
-
-  describe "read_only permission set (Vorstand/Buchhaltung)" do
-    setup do
-      user = create_user_with_permission_set("read_only")
-      linked_member = create_linked_member_for_user(user)
-      unlinked_member = create_unlinked_member()
-
-      # Reload user to get updated member_id
-      {:ok, user} = Ash.get(Accounts.User, user.id, domain: Mv.Accounts, load: [:role])
-
-      %{user: user, linked_member: linked_member, unlinked_member: unlinked_member}
-    end
-
-    test "can read all members", %{
-      user: user,
-      linked_member: linked_member,
-      unlinked_member: unlinked_member
-    } do
-      {:ok, members} = Ash.read(Membership.Member, actor: user, domain: Mv.Membership)
-
-      # Should return all members (scope :all)
-      member_ids = Enum.map(members, & &1.id)
-      assert linked_member.id in member_ids
-      assert unlinked_member.id in member_ids
-    end
-
-    test "can read individual member", %{user: user, unlinked_member: unlinked_member} do
-      {:ok, member} =
-        Ash.get(Membership.Member, unlinked_member.id, actor: user, domain: Mv.Membership)
-
-      assert member.id == unlinked_member.id
-    end
-
-    test "cannot create member (returns forbidden)", %{user: user} do
-      assert_raise Ash.Error.Forbidden, fn ->
-        Membership.Member
-        |> Ash.Changeset.for_create(:create_member, %{
-          first_name: "New",
-          last_name: "Member",
-          email: "new#{System.unique_integer([:positive])}@example.com"
-        })
-        |> Ash.create!(actor: user)
-      end
-    end
-
-    test "cannot update any member (returns forbidden)", %{
-      user: user,
-      linked_member: linked_member
-    } do
-      assert_raise Ash.Error.Forbidden, fn ->
-        linked_member
-        |> Ash.Changeset.for_update(:update_member, %{first_name: "Updated"})
-        |> Ash.update!(actor: user)
-      end
-    end
-
-    test "cannot destroy any member (returns forbidden)", %{
-      user: user,
-      unlinked_member: unlinked_member
-    } do
-      assert_raise Ash.Error.Forbidden, fn ->
-        Ash.destroy!(unlinked_member, actor: user)
-      end
-    end
-  end
-
-  describe "normal_user permission set (Kassenwart)" do
-    setup do
-      user = create_user_with_permission_set("normal_user")
-      linked_member = create_linked_member_for_user(user)
-      unlinked_member = create_unlinked_member()
-
-      # Reload user to get updated member_id
-      {:ok, user} = Ash.get(Accounts.User, user.id, domain: Mv.Accounts, load: [:role])
-
-      %{user: user, linked_member: linked_member, unlinked_member: unlinked_member}
-    end
-
-    test "can read all members", %{
-      user: user,
-      linked_member: linked_member,
-      unlinked_member: unlinked_member
-    } do
-      {:ok, members} = Ash.read(Membership.Member, actor: user, domain: Mv.Membership)
-
-      # Should return all members (scope :all)
-      member_ids = Enum.map(members, & &1.id)
-      assert linked_member.id in member_ids
-      assert unlinked_member.id in member_ids
-    end
-
-    test "can create member", %{user: user} do
-      {:ok, member} =
-        Membership.Member
-        |> Ash.Changeset.for_create(:create_member, %{
-          first_name: "New",
-          last_name: "Member",
-          email: "new#{System.unique_integer([:positive])}@example.com"
-        })
-        |> Ash.create(actor: user)
-
-      assert member.first_name == "New"
-    end
-
-    test "can update any member", %{user: user, unlinked_member: unlinked_member} do
-      {:ok, updated_member} =
-        unlinked_member
-        |> Ash.Changeset.for_update(:update_member, %{first_name: "Updated"})
-        |> Ash.update(actor: user)
-
-      assert updated_member.first_name == "Updated"
-    end
-
-    test "cannot destroy member (safety - not in permission set)", %{
-      user: user,
-      unlinked_member: unlinked_member
-    } do
-      assert_raise Ash.Error.Forbidden, fn ->
-        Ash.destroy!(unlinked_member, actor: user)
-      end
-    end
-  end
-
-  describe "admin permission set" do
-    setup do
-      user = create_user_with_permission_set("admin")
-      linked_member = create_linked_member_for_user(user)
-      unlinked_member = create_unlinked_member()
-
-      # Reload user to get updated member_id
-      {:ok, user} = Ash.get(Accounts.User, user.id, domain: Mv.Accounts, load: [:role])
-
-      %{user: user, linked_member: linked_member, unlinked_member: unlinked_member}
-    end
-
-    test "can read all members", %{
-      user: user,
-      linked_member: linked_member,
-      unlinked_member: unlinked_member
-    } do
-      {:ok, members} = Ash.read(Membership.Member, actor: user, domain: Mv.Membership)
-
-      # Should return all members (scope :all)
-      member_ids = Enum.map(members, & &1.id)
-      assert linked_member.id in member_ids
-      assert unlinked_member.id in member_ids
-    end
-
-    test "can create member", %{user: user} do
-      {:ok, member} =
-        Membership.Member
-        |> Ash.Changeset.for_create(:create_member, %{
-          first_name: "New",
-          last_name: "Member",
-          email: "new#{System.unique_integer([:positive])}@example.com"
-        })
-        |> Ash.create(actor: user)
-
-      assert member.first_name == "New"
-    end
-
-    test "can update any member", %{user: user, unlinked_member: unlinked_member} do
-      {:ok, updated_member} =
-        unlinked_member
-        |> Ash.Changeset.for_update(:update_member, %{first_name: "Updated"})
-        |> Ash.update(actor: user)
-
-      assert updated_member.first_name == "Updated"
-    end
-
-    test "can destroy any member", %{user: user, unlinked_member: unlinked_member} do
-      :ok = Ash.destroy(unlinked_member, actor: user)
-
-      # Verify member is deleted
-      assert {:error, _} = Ash.get(Membership.Member, unlinked_member.id, domain: Mv.Membership)
-    end
-  end
-
-  describe "special case: user can always READ linked member" do
-    # Note: The special case policy only applies to :read actions.
-    # Updates are handled by HasPermission with :linked scope (if permission exists).
-
-    test "read_only user can read linked member (via special case bypass)" do
-      # read_only has Member.read scope :all, but the special case ensures
-      # users can ALWAYS read their linked member, even if they had no read permission.
-      # This test verifies the special case works independently of permission sets.
-      user = create_user_with_permission_set("read_only")
-      linked_member = create_linked_member_for_user(user)
-
-      # Reload user to get updated member_id
-      {:ok, user} = Ash.get(Accounts.User, user.id, domain: Mv.Accounts, load: [:role])
-      {:ok, user} = Ash.load(user, :member, domain: Mv.Accounts)
-
-      # Should succeed (special case bypass policy for :read takes precedence)
-      {:ok, member} =
-        Ash.get(Membership.Member, linked_member.id, actor: user, domain: Mv.Membership)
-
-      assert member.id == linked_member.id
-    end
-
-    test "own_data user can read linked member (via special case bypass)" do
-      # own_data has Member.read scope :linked, but the special case ensures
-      # users can ALWAYS read their linked member regardless of permission set.
-      user = create_user_with_permission_set("own_data")
-      linked_member = create_linked_member_for_user(user)
-
-      # Reload user to get updated member_id
-      {:ok, user} = Ash.get(Accounts.User, user.id, domain: Mv.Accounts, load: [:role])
-      {:ok, user} = Ash.load(user, :member, domain: Mv.Accounts)
-
-      # Should succeed (special case bypass policy for :read takes precedence)
-      {:ok, member} =
-        Ash.get(Membership.Member, linked_member.id, actor: user, domain: Mv.Membership)
-
-      assert member.id == linked_member.id
-    end
-
-    test "own_data user can update linked member (via HasPermission :linked scope)" do
-      # Update is NOT handled by special case - it's handled by HasPermission
-      # with :linked scope. own_data has Member.update scope :linked.
-      user = create_user_with_permission_set("own_data")
-      linked_member = create_linked_member_for_user(user)
-
-      # Reload user to get updated member_id
-      {:ok, user} = Ash.get(Accounts.User, user.id, domain: Mv.Accounts, load: [:role])
-      {:ok, user} = Ash.load(user, :member, domain: Mv.Accounts)
-
-      # Should succeed via HasPermission check (not special case)
-      {:ok, updated_member} =
-        linked_member
-        |> Ash.Changeset.for_update(:update_member, %{first_name: "Updated"})
-        |> Ash.update(actor: user)
-
-      assert updated_member.first_name == "Updated"
-    end
-  end
-end
diff --git a/test/mv_web/controllers/auth_controller_test.exs b/test/mv_web/controllers/auth_controller_test.exs
index 444571b..3c3956d 100644
--- a/test/mv_web/controllers/auth_controller_test.exs
+++ b/test/mv_web/controllers/auth_controller_test.exs
@@ -1,42 +1,21 @@
 defmodule MvWeb.AuthControllerTest do
   use MvWeb.ConnCase, async: true
   import Phoenix.LiveViewTest
-  import Phoenix.ConnTest
-
-  # Helper to create an unauthenticated conn (preserves sandbox metadata)
-  defp build_unauthenticated_conn(authenticated_conn) do
-    # Create new conn but preserve sandbox metadata for database access
-    new_conn = build_conn()
-
-    # Copy sandbox metadata from authenticated conn
-    if authenticated_conn.private[:ecto_sandbox] do
-      Plug.Conn.put_private(new_conn, :ecto_sandbox, authenticated_conn.private[:ecto_sandbox])
-    else
-      new_conn
-    end
-  end
 
   # Basic UI tests
-  test "GET /sign-in shows sign in form", %{conn: authenticated_conn} do
-    # Create unauthenticated conn for this test
-    conn = build_unauthenticated_conn(authenticated_conn)
+  test "GET /sign-in shows sign in form", %{conn: conn} do
     conn = get(conn, ~p"/sign-in")
     assert html_response(conn, 200) =~ "Sign in"
   end
 
-  test "GET /sign-out redirects to home", %{conn: authenticated_conn} do
-    conn = conn_with_oidc_user(authenticated_conn)
+  test "GET /sign-out redirects to home", %{conn: conn} do
+    conn = conn_with_oidc_user(conn)
     conn = get(conn, ~p"/sign-out")
     assert redirected_to(conn) == ~p"/"
   end
 
   # Password authentication (LiveView)
-  test "password user can sign in with valid credentials via LiveView", %{
-    conn: authenticated_conn
-  } do
-    # Create unauthenticated conn for this test
-    conn = build_unauthenticated_conn(authenticated_conn)
-
+  test "password user can sign in with valid credentials via LiveView", %{conn: conn} do
     _user =
       create_test_user(%{
         email: "password@example.com",
@@ -56,12 +35,7 @@ defmodule MvWeb.AuthControllerTest do
     assert to =~ "/auth/user/password/sign_in_with_token"
   end
 
-  test "password user with invalid credentials shows error via LiveView", %{
-    conn: authenticated_conn
-  } do
-    # Create unauthenticated conn for this test
-    conn = build_unauthenticated_conn(authenticated_conn)
-
+  test "password user with invalid credentials shows error via LiveView", %{conn: conn} do
     _user =
       create_test_user(%{
         email: "test@example.com",
@@ -81,12 +55,7 @@ defmodule MvWeb.AuthControllerTest do
     assert html =~ "Email or password was incorrect"
   end
 
-  test "password user with non-existent email shows error via LiveView", %{
-    conn: authenticated_conn
-  } do
-    # Create unauthenticated conn for this test
-    conn = build_unauthenticated_conn(authenticated_conn)
-
+  test "password user with non-existent email shows error via LiveView", %{conn: conn} do
     {:ok, view, _html} = live(conn, "/sign-in")
 
     html =
@@ -100,10 +69,7 @@ defmodule MvWeb.AuthControllerTest do
   end
 
   # Registration (LiveView)
-  test "user can register with valid credentials via LiveView", %{conn: authenticated_conn} do
-    # Create unauthenticated conn for this test
-    conn = build_unauthenticated_conn(authenticated_conn)
-
+  test "user can register with valid credentials via LiveView", %{conn: conn} do
     {:ok, view, _html} = live(conn, "/register")
 
     {:error, {:redirect, %{to: to}}} =
@@ -116,10 +82,7 @@ defmodule MvWeb.AuthControllerTest do
     assert to =~ "/auth/user/password/sign_in_with_token"
   end
 
-  test "registration with existing email shows error via LiveView", %{conn: authenticated_conn} do
-    # Create unauthenticated conn for this test
-    conn = build_unauthenticated_conn(authenticated_conn)
-
+  test "registration with existing email shows error via LiveView", %{conn: conn} do
     _user =
       create_test_user(%{
         email: "existing@example.com",
@@ -139,10 +102,7 @@ defmodule MvWeb.AuthControllerTest do
     assert html =~ "has already been taken"
   end
 
-  test "registration with weak password shows error via LiveView", %{conn: authenticated_conn} do
-    # Create unauthenticated conn for this test
-    conn = build_unauthenticated_conn(authenticated_conn)
-
+  test "registration with weak password shows error via LiveView", %{conn: conn} do
     {:ok, view, _html} = live(conn, "/register")
 
     html =
@@ -156,27 +116,18 @@ defmodule MvWeb.AuthControllerTest do
   end
 
   # Access control
-  test "unauthenticated user accessing protected route gets redirected to sign-in", %{
-    conn: authenticated_conn
-  } do
-    # Create unauthenticated conn for this test
-    conn = build_unauthenticated_conn(authenticated_conn)
+  test "unauthenticated user accessing protected route gets redirected to sign-in", %{conn: conn} do
     conn = get(conn, ~p"/members")
     assert redirected_to(conn) == ~p"/sign-in"
   end
 
-  test "authenticated user can access protected route", %{conn: authenticated_conn} do
-    conn = conn_with_oidc_user(authenticated_conn)
+  test "authenticated user can access protected route", %{conn: conn} do
+    conn = conn_with_oidc_user(conn)
     conn = get(conn, ~p"/members")
     assert conn.status == 200
   end
 
-  test "password authenticated user can access protected route via LiveView", %{
-    conn: authenticated_conn
-  } do
-    # Create unauthenticated conn for this test
-    conn = build_unauthenticated_conn(authenticated_conn)
-
+  test "password authenticated user can access protected route via LiveView", %{conn: conn} do
     _user =
       create_test_user(%{
         email: "auth@example.com",
@@ -199,12 +150,7 @@ defmodule MvWeb.AuthControllerTest do
   end
 
   # Edge cases
-  test "user with nil oidc_id can still sign in with password via LiveView", %{
-    conn: authenticated_conn
-  } do
-    # Create unauthenticated conn for this test
-    conn = build_unauthenticated_conn(authenticated_conn)
-
+  test "user with nil oidc_id can still sign in with password via LiveView", %{conn: conn} do
     _user =
       create_test_user(%{
         email: "nil_oidc@example.com",
@@ -224,12 +170,7 @@ defmodule MvWeb.AuthControllerTest do
     assert to =~ "/auth/user/password/sign_in_with_token"
   end
 
-  test "user with empty string oidc_id is handled correctly via LiveView", %{
-    conn: authenticated_conn
-  } do
-    # Create unauthenticated conn for this test
-    conn = build_unauthenticated_conn(authenticated_conn)
-
+  test "user with empty string oidc_id is handled correctly via LiveView", %{conn: conn} do
     _user =
       create_test_user(%{
         email: "empty_oidc@example.com",
diff --git a/test/mv_web/live/membership_fee_type_live/index_test.exs b/test/mv_web/live/membership_fee_type_live/index_test.exs
index 9c5ad55..bb10a13 100644
--- a/test/mv_web/live/membership_fee_type_live/index_test.exs
+++ b/test/mv_web/live/membership_fee_type_live/index_test.exs
@@ -11,8 +11,19 @@ defmodule MvWeb.MembershipFeeTypeLive.IndexTest do
 
   require Ash.Query
 
-  # Use global setup from ConnCase which provides admin user with role
-  # No custom setup needed
+  setup %{conn: conn} do
+    # Create admin user
+    {:ok, user} =
+      Mv.Accounts.User
+      |> Ash.Changeset.for_create(:register_with_password, %{
+        email: "admin#{System.unique_integer([:positive])}@mv.local",
+        password: "testpassword123"
+      })
+      |> Ash.create()
+
+    authenticated_conn = conn_with_password_user(conn, user)
+    %{conn: authenticated_conn, user: user}
+  end
 
   # Helper to create a membership fee type
   defp create_fee_type(attrs) do
@@ -30,8 +41,7 @@ defmodule MvWeb.MembershipFeeTypeLive.IndexTest do
   end
 
   # Helper to create a member
-  # Uses admin actor from global setup to ensure authorization
-  defp create_member(attrs, actor) do
+  defp create_member(attrs) do
     default_attrs = %{
       first_name: "Test",
       last_name: "Member",
@@ -40,11 +50,9 @@ defmodule MvWeb.MembershipFeeTypeLive.IndexTest do
 
     attrs = Map.merge(default_attrs, attrs)
 
-    opts = if actor, do: [actor: actor], else: []
-
     Member
     |> Ash.Changeset.for_create(:create_member, attrs)
-    |> Ash.create!(opts)
+    |> Ash.create!()
   end
 
   describe "list display" do
@@ -64,12 +72,12 @@ defmodule MvWeb.MembershipFeeTypeLive.IndexTest do
       assert html =~ "Yearly" || html =~ "Jährlich"
     end
 
-    test "member count column shows correct count", %{conn: conn, current_user: admin_user} do
+    test "member count column shows correct count", %{conn: conn} do
       fee_type = create_fee_type(%{interval: :yearly})
 
       # Create 3 members with this fee type
       Enum.each(1..3, fn _ ->
-        create_member(%{membership_fee_type_id: fee_type.id}, admin_user)
+        create_member(%{membership_fee_type_id: fee_type.id})
       end)
 
       {:ok, _view, html} = live(conn, "/membership_fee_types")
@@ -103,9 +111,9 @@ defmodule MvWeb.MembershipFeeTypeLive.IndexTest do
   end
 
   describe "delete functionality" do
-    test "delete button disabled if type is in use", %{conn: conn, current_user: admin_user} do
+    test "delete button disabled if type is in use", %{conn: conn} do
       fee_type = create_fee_type(%{interval: :yearly})
-      create_member(%{membership_fee_type_id: fee_type.id}, admin_user)
+      create_member(%{membership_fee_type_id: fee_type.id})
 
       {:ok, _view, html} = live(conn, "/membership_fee_types")
 
diff --git a/test/mv_web/member_live/form_membership_fee_type_test.exs b/test/mv_web/member_live/form_membership_fee_type_test.exs
index 4293e67..cc4388f 100644
--- a/test/mv_web/member_live/form_membership_fee_type_test.exs
+++ b/test/mv_web/member_live/form_membership_fee_type_test.exs
@@ -11,6 +11,20 @@ defmodule MvWeb.MemberLive.FormMembershipFeeTypeTest do
 
   require Ash.Query
 
+  setup %{conn: conn} do
+    # Create admin user
+    {:ok, user} =
+      Mv.Accounts.User
+      |> Ash.Changeset.for_create(:register_with_password, %{
+        email: "admin#{System.unique_integer([:positive])}@mv.local",
+        password: "testpassword123"
+      })
+      |> Ash.create()
+
+    authenticated_conn = conn_with_password_user(conn, user)
+    %{conn: authenticated_conn, user: user}
+  end
+
   # Helper to create a membership fee type
   defp create_fee_type(attrs) do
     default_attrs = %{
@@ -150,153 +164,4 @@ defmodule MvWeb.MemberLive.FormMembershipFeeTypeTest do
       assert html =~ fee_type.name || html =~ "selected"
     end
   end
-
-  describe "custom field value preservation" do
-    test "custom field values preserved when membership fee type changes", %{
-      conn: conn,
-      current_user: admin_user
-    } do
-      # Create custom field
-      custom_field =
-        Mv.Membership.CustomField
-        |> Ash.Changeset.for_create(:create, %{
-          name: "Test Field",
-          value_type: :string,
-          required: false
-        })
-        |> Ash.create!()
-
-      # Create two fee types with same interval
-      fee_type1 = create_fee_type(%{name: "Type 1", interval: :yearly})
-      fee_type2 = create_fee_type(%{name: "Type 2", interval: :yearly})
-
-      # Create member with fee type 1 and custom field value
-      member =
-        Member
-        |> Ash.Changeset.for_create(:create_member, %{
-          first_name: "Test",
-          last_name: "Member",
-          email: "test#{System.unique_integer([:positive])}@example.com",
-          membership_fee_type_id: fee_type1.id
-        })
-        |> Ash.create!(actor: admin_user)
-
-      # Add custom field value
-      Mv.Membership.CustomFieldValue
-      |> Ash.Changeset.for_create(:create, %{
-        member_id: member.id,
-        custom_field_id: custom_field.id,
-        value: %{"_union_type" => "string", "_union_value" => "Test Value"}
-      })
-      |> Ash.create!(actor: admin_user)
-
-      {:ok, view, _html} = live(conn, "/members/#{member.id}/edit")
-
-      # Change membership fee type dropdown
-      html =
-        view
-        |> form("#member-form", %{"member[membership_fee_type_id]" => fee_type2.id})
-        |> render_change()
-
-      # Verify custom field value is still present (check for field name or value)
-      assert html =~ custom_field.name || html =~ "Test Value"
-    end
-
-    test "union/typed values roundtrip correctly", %{conn: conn, current_user: admin_user} do
-      # Create date custom field
-      custom_field =
-        Mv.Membership.CustomField
-        |> Ash.Changeset.for_create(:create, %{
-          name: "Date Field",
-          value_type: :date,
-          required: false
-        })
-        |> Ash.create!()
-
-      fee_type = create_fee_type(%{interval: :yearly})
-
-      # Create member with date custom field value
-      member =
-        Member
-        |> Ash.Changeset.for_create(:create_member, %{
-          first_name: "Test",
-          last_name: "Member",
-          email: "test#{System.unique_integer([:positive])}@example.com",
-          membership_fee_type_id: fee_type.id
-        })
-        |> Ash.create!(actor: admin_user)
-
-      test_date = ~D[2024-01-15]
-
-      # Add date custom field value
-      Mv.Membership.CustomFieldValue
-      |> Ash.Changeset.for_create(:create, %{
-        member_id: member.id,
-        custom_field_id: custom_field.id,
-        value: %{"_union_type" => "date", "_union_value" => test_date}
-      })
-      |> Ash.create!(actor: admin_user)
-
-      {:ok, view, _html} = live(conn, "/members/#{member.id}/edit")
-
-      # Trigger validation (simulates dropdown change)
-      html =
-        view
-        |> form("#member-form", %{"member[membership_fee_type_id]" => fee_type.id})
-        |> render_change()
-
-      # Verify date value is still present (check for date input or formatted date)
-      assert html =~ "2024" || html =~ "date"
-    end
-
-    test "removing custom field values works correctly", %{conn: conn, current_user: admin_user} do
-      # Create custom field
-      custom_field =
-        Mv.Membership.CustomField
-        |> Ash.Changeset.for_create(:create, %{
-          name: "Test Field",
-          value_type: :string,
-          required: false
-        })
-        |> Ash.create!()
-
-      fee_type = create_fee_type(%{interval: :yearly})
-
-      # Create member with custom field value
-      member =
-        Member
-        |> Ash.Changeset.for_create(:create_member, %{
-          first_name: "Test",
-          last_name: "Member",
-          email: "test#{System.unique_integer([:positive])}@example.com",
-          membership_fee_type_id: fee_type.id
-        })
-        |> Ash.create!(actor: admin_user)
-
-      # Add custom field value
-      _cfv =
-        Mv.Membership.CustomFieldValue
-        |> Ash.Changeset.for_create(:create, %{
-          member_id: member.id,
-          custom_field_id: custom_field.id,
-          value: %{"_union_type" => "string", "_union_value" => "Test Value"}
-        })
-        |> Ash.create!(actor: admin_user)
-
-      {:ok, view, _html} = live(conn, "/members/#{member.id}/edit")
-
-      # Change membership fee type to trigger validation
-      # This should preserve the custom field value
-      html =
-        view
-        |> form("#member-form", %{
-          "member[membership_fee_type_id]" => fee_type.id
-        })
-        |> render_change()
-
-      # Form should still be valid and custom field value should be preserved
-      # The custom field value should still be visible in the form
-      assert html =~ "Test Value" || html =~ custom_field.name
-    end
-  end
 end
diff --git a/test/mv_web/member_live/index_display_name_test.exs b/test/mv_web/member_live/index_display_name_test.exs
new file mode 100644
index 0000000..7a11235
--- /dev/null
+++ b/test/mv_web/member_live/index_display_name_test.exs
@@ -0,0 +1,141 @@
+defmodule MvWeb.Helpers.MemberHelpersTest do
+  @moduledoc """
+  Tests for the display_name/1 helper function in MemberHelpers.
+  """
+  use Mv.DataCase, async: true
+
+  alias Mv.Membership.Member
+  alias MvWeb.Helpers.MemberHelpers
+
+  describe "display_name/1" do
+    test "returns full name when both first_name and last_name are present" do
+      member = %Member{
+        first_name: "John",
+        last_name: "Doe",
+        email: "john@example.com"
+      }
+
+      assert MemberHelpers.display_name(member) == "John Doe"
+    end
+
+    test "returns email when both first_name and last_name are nil" do
+      member = %Member{
+        first_name: nil,
+        last_name: nil,
+        email: "john@example.com"
+      }
+
+      assert MemberHelpers.display_name(member) == "john@example.com"
+    end
+
+    test "returns first_name only when last_name is nil" do
+      member = %Member{
+        first_name: "John",
+        last_name: nil,
+        email: "john@example.com"
+      }
+
+      assert MemberHelpers.display_name(member) == "John"
+    end
+
+    test "returns last_name only when first_name is nil" do
+      member = %Member{
+        first_name: nil,
+        last_name: "Doe",
+        email: "john@example.com"
+      }
+
+      assert MemberHelpers.display_name(member) == "Doe"
+    end
+
+    test "returns email when first_name and last_name are empty strings" do
+      member = %Member{
+        first_name: "",
+        last_name: "",
+        email: "john@example.com"
+      }
+
+      assert MemberHelpers.display_name(member) == "john@example.com"
+    end
+
+    test "returns email when first_name and last_name are whitespace only" do
+      member = %Member{
+        first_name: "   ",
+        last_name: "  \t  ",
+        email: "john@example.com"
+      }
+
+      assert MemberHelpers.display_name(member) == "john@example.com"
+    end
+
+    test "trims whitespace from name parts" do
+      member = %Member{
+        first_name: "  John  ",
+        last_name: "  Doe  ",
+        email: "john@example.com"
+      }
+
+      assert MemberHelpers.display_name(member) == "John Doe"
+    end
+
+    test "handles one empty string and one nil" do
+      member = %Member{
+        first_name: "",
+        last_name: nil,
+        email: "john@example.com"
+      }
+
+      assert MemberHelpers.display_name(member) == "john@example.com"
+    end
+
+    test "handles one nil and one empty string" do
+      member = %Member{
+        first_name: nil,
+        last_name: "",
+        email: "john@example.com"
+      }
+
+      assert MemberHelpers.display_name(member) == "john@example.com"
+    end
+
+    test "handles one whitespace and one nil" do
+      member = %Member{
+        first_name: "   ",
+        last_name: nil,
+        email: "john@example.com"
+      }
+
+      assert MemberHelpers.display_name(member) == "john@example.com"
+    end
+
+    test "handles one valid name and one whitespace" do
+      member = %Member{
+        first_name: "John",
+        last_name: "   ",
+        email: "john@example.com"
+      }
+
+      assert MemberHelpers.display_name(member) == "John"
+    end
+
+    test "handles member with only first_name containing whitespace" do
+      member = %Member{
+        first_name: "  John  ",
+        last_name: nil,
+        email: "john@example.com"
+      }
+
+      assert MemberHelpers.display_name(member) == "John"
+    end
+
+    test "handles member with only last_name containing whitespace" do
+      member = %Member{
+        first_name: nil,
+        last_name: "  Doe  ",
+        email: "john@example.com"
+      }
+
+      assert MemberHelpers.display_name(member) == "Doe"
+    end
+  end
+end
diff --git a/test/mv_web/member_live/index_membership_fee_status_test.exs b/test/mv_web/member_live/index_membership_fee_status_test.exs
index a189873..baa5f67 100644
--- a/test/mv_web/member_live/index_membership_fee_status_test.exs
+++ b/test/mv_web/member_live/index_membership_fee_status_test.exs
@@ -12,6 +12,20 @@ defmodule MvWeb.MemberLive.IndexMembershipFeeStatusTest do
 
   require Ash.Query
 
+  setup %{conn: conn} do
+    # Create admin user
+    {:ok, user} =
+      Mv.Accounts.User
+      |> Ash.Changeset.for_create(:register_with_password, %{
+        email: "admin#{System.unique_integer([:positive])}@mv.local",
+        password: "testpassword123"
+      })
+      |> Ash.create()
+
+    conn = conn_with_password_user(conn, user)
+    %{conn: conn, user: user}
+  end
+
   # Helper to create a membership fee type
   defp create_fee_type(attrs) do
     default_attrs = %{
diff --git a/test/mv_web/member_live/membership_fee_integration_test.exs b/test/mv_web/member_live/membership_fee_integration_test.exs
index 9358c70..e76e422 100644
--- a/test/mv_web/member_live/membership_fee_integration_test.exs
+++ b/test/mv_web/member_live/membership_fee_integration_test.exs
@@ -12,6 +12,20 @@ defmodule MvWeb.MemberLive.MembershipFeeIntegrationTest do
 
   require Ash.Query
 
+  setup do
+    # Create admin user
+    {:ok, user} =
+      Mv.Accounts.User
+      |> Ash.Changeset.for_create(:register_with_password, %{
+        email: "admin#{System.unique_integer([:positive])}@mv.local",
+        password: "testpassword123"
+      })
+      |> Ash.create()
+
+    conn = conn_with_password_user(build_conn(), user)
+    %{conn: conn, user: user}
+  end
+
   # Helper to create a membership fee type
   defp create_fee_type(attrs) do
     default_attrs = %{
diff --git a/test/mv_web/member_live/show_membership_fees_test.exs b/test/mv_web/member_live/show_membership_fees_test.exs
index d0402c3..1f68244 100644
--- a/test/mv_web/member_live/show_membership_fees_test.exs
+++ b/test/mv_web/member_live/show_membership_fees_test.exs
@@ -12,6 +12,20 @@ defmodule MvWeb.MemberLive.ShowMembershipFeesTest do
 
   require Ash.Query
 
+  setup %{conn: conn} do
+    # Create admin user
+    {:ok, user} =
+      Mv.Accounts.User
+      |> Ash.Changeset.for_create(:register_with_password, %{
+        email: "admin#{System.unique_integer([:positive])}@mv.local",
+        password: "testpassword123"
+      })
+      |> Ash.create()
+
+    conn = conn_with_password_user(conn, user)
+    %{conn: conn, user: user}
+  end
+
   # Helper to create a membership fee type
   defp create_fee_type(attrs) do
     default_attrs = %{
diff --git a/test/mv_web/member_live/show_test.exs b/test/mv_web/member_live/show_test.exs
index fdcfebb..1e04559 100644
--- a/test/mv_web/member_live/show_test.exs
+++ b/test/mv_web/member_live/show_test.exs
@@ -7,13 +7,13 @@ defmodule MvWeb.MemberLive.ShowTest do
   - Custom Fields section visibility (Issue #282 regression test)
   - Custom field values formatting
 
-  ## Note on async
-  Tests can run with `async: true` because:
-  - Each test explicitly manages its own custom fields (creates/deletes as needed)
-  - The SQL Sandbox provides proper isolation between parallel tests
-  - Custom field cleanup in tests ensures no interference between tests
+  ## Note on async: false
+  Tests use `async: false` (not `async: true`) to prevent PostgreSQL deadlocks
+  when creating members and custom fields concurrently. This is intentional and
+  documented here to avoid confusion in commit messages.
   """
-  use MvWeb.ConnCase, async: true
+  # async: false to prevent PostgreSQL deadlocks when creating members and custom fields
+  use MvWeb.ConnCase, async: false
   import Phoenix.LiveViewTest
   require Ash.Query
   use Gettext, backend: MvWeb.Gettext
@@ -113,22 +113,11 @@ defmodule MvWeb.MemberLive.ShowTest do
       conn: conn,
       member: member
     } do
-      # Ensure no custom fields exist for this test
-      # This ensures test isolation even if previous tests created custom fields
-      existing_custom_fields = Ash.read!(CustomField)
-
-      for cf <- existing_custom_fields do
-        Ash.destroy!(cf)
-      end
-
-      # Verify no custom fields exist
-      assert Ash.read!(CustomField) == []
-
       conn = conn_with_oidc_user(conn)
       {:ok, _view, html} = live(conn, ~p"/members/#{member}")
 
       # Custom Fields section should NOT be visible
-      refute html =~ gettext("Additional Data Fields")
+      refute html =~ gettext("Custom Fields")
     end
   end
 
diff --git a/test/support/conn_case.ex b/test/support/conn_case.ex
index 3b2a5ed..853a326 100644
--- a/test/support/conn_case.ex
+++ b/test/support/conn_case.ex
@@ -99,7 +99,6 @@ defmodule MvWeb.ConnCase do
   @doc """
   Signs in a user via OIDC and returns a connection with the user authenticated.
   By default creates a user with "user@example.com" for consistency.
-  The user will have an admin role for authorization.
   """
   def conn_with_oidc_user(conn, user_attrs \\ %{}) do
     # Ensure unique email for OIDC users
@@ -110,22 +109,8 @@ defmodule MvWeb.ConnCase do
       oidc_id: "oidc_#{unique_id}"
     }
 
-    # Create user using Ash.Seed (supports oidc_id)
     user = create_test_user(Map.merge(default_attrs, user_attrs))
-
-    # Create admin role and assign it
-    admin_role = Mv.Fixtures.role_fixture("admin")
-
-    {:ok, user} =
-      user
-      |> Ash.Changeset.for_update(:update, %{})
-      |> Ash.Changeset.manage_relationship(:role, admin_role, type: :append_and_remove)
-      |> Ash.update()
-
-    # Load role for authorization
-    user_with_role = Ash.load!(user, :role, domain: Mv.Accounts)
-
-    sign_in_user_via_oidc(conn, user_with_role)
+    sign_in_user_via_oidc(conn, user)
   end
 
   @doc """
@@ -137,15 +122,6 @@ defmodule MvWeb.ConnCase do
     |> AshAuthentication.Plug.Helpers.store_in_session(user)
   end
 
-  @doc """
-  Creates a connection with an authenticated user that has an admin role.
-  This is useful for tests that need full access to resources.
-  """
-  def conn_with_admin_user(conn) do
-    admin_user = Mv.Fixtures.user_with_role_fixture("admin")
-    conn_with_password_user(conn, admin_user)
-  end
-
   setup tags do
     pid = Mv.DataCase.setup_sandbox(tags)
 
@@ -154,36 +130,6 @@ defmodule MvWeb.ConnCase do
     # to share the test's database connection in async tests
     conn = Plug.Conn.put_private(conn, :ecto_sandbox, pid)
 
-    # Handle role tags for future test extensions
-    # Default to admin to maintain backward compatibility with existing tests
-    role = Map.get(tags, :role, :admin)
-
-    {conn, user} =
-      case role do
-        :admin ->
-          # Create admin user with role for all tests (unless test overrides with its own user)
-          # This ensures all tests have an authenticated user with proper authorization
-          admin_user = Mv.Fixtures.user_with_role_fixture("admin")
-          authenticated_conn = conn_with_password_user(conn, admin_user)
-          {authenticated_conn, admin_user}
-
-        :member ->
-          # Create member user for role-based testing
-          member_user = Mv.Fixtures.user_with_role_fixture("member")
-          authenticated_conn = conn_with_password_user(conn, member_user)
-          {authenticated_conn, member_user}
-
-        :unauthenticated ->
-          # No authentication for unauthenticated tests
-          {conn, nil}
-
-        _other ->
-          # Fallback: treat unknown role as admin for safety
-          admin_user = Mv.Fixtures.user_with_role_fixture("admin")
-          authenticated_conn = conn_with_password_user(conn, admin_user)
-          {authenticated_conn, admin_user}
-      end
-
-    {:ok, conn: conn, current_user: user}
+    {:ok, conn: conn}
   end
 end
diff --git a/test/support/fixtures.ex b/test/support/fixtures.ex
index d474764..5dd14a9 100644
--- a/test/support/fixtures.ex
+++ b/test/support/fixtures.ex
@@ -93,104 +93,4 @@ defmodule Mv.Fixtures do
 
     {user, member}
   end
-
-  @doc """
-  Creates a role with a specific permission set.
-
-  ## Parameters
-    - `permission_set_name` - The permission set name (e.g., "admin", "read_only", "normal_user", "own_data")
-
-  ## Returns
-    - Role struct
-
-  ## Examples
-
-      iex> role_fixture("admin")
-      %Mv.Authorization.Role{permission_set_name: "admin", ...}
-
-  """
-  def role_fixture(permission_set_name) do
-    role_name = "Test Role #{permission_set_name} #{System.unique_integer([:positive])}"
-
-    case Mv.Authorization.create_role(%{
-           name: role_name,
-           description: "Test role for #{permission_set_name}",
-           permission_set_name: permission_set_name
-         }) do
-      {:ok, role} -> role
-      {:error, error} -> raise "Failed to create role: #{inspect(error)}"
-    end
-  end
-
-  @doc """
-  Creates a user with a specific permission set (role).
-
-  ## Parameters
-    - `permission_set_name` - The permission set name (e.g., "admin", "read_only", "normal_user", "own_data")
-    - `user_attrs` - Optional user attributes
-
-  ## Returns
-    - User struct with role preloaded
-
-  ## Examples
-
-      iex> admin_user = user_with_role_fixture("admin")
-      iex> admin_user.role.permission_set_name
-      "admin"
-
-  """
-  def user_with_role_fixture(permission_set_name \\ "admin", user_attrs \\ %{}) do
-    # Create role with permission set
-    role = role_fixture(permission_set_name)
-
-    # Create user
-    {:ok, user} =
-      user_attrs
-      |> Enum.into(%{
-        email: "user#{System.unique_integer([:positive])}@example.com"
-      })
-      |> Mv.Accounts.create_user()
-
-    # Assign role to user
-    {:ok, user} =
-      user
-      |> Ash.Changeset.for_update(:update, %{})
-      |> Ash.Changeset.manage_relationship(:role, role, type: :append_and_remove)
-      |> Ash.update()
-
-    # Reload user with role preloaded (critical for authorization!)
-    {:ok, user_with_role} = Ash.load(user, :role, domain: Mv.Accounts)
-    user_with_role
-  end
-
-  @doc """
-  Creates a member with an actor (for use in tests with policies).
-
-  ## Parameters
-    - `attrs` - Map or keyword list of attributes to override defaults
-    - `actor` - The actor (user) to use for authorization
-
-  ## Returns
-    - Member struct
-
-  ## Examples
-
-      iex> admin = user_with_role_fixture("admin")
-      iex> member_fixture_with_actor(%{first_name: "Alice"}, admin)
-      %Mv.Membership.Member{first_name: "Alice", ...}
-
-  """
-  def member_fixture_with_actor(attrs \\ %{}, actor) do
-    attrs
-    |> Enum.into(%{
-      first_name: "Test",
-      last_name: "Member",
-      email: "test#{System.unique_integer([:positive])}@example.com"
-    })
-    |> Mv.Membership.create_member(actor: actor)
-    |> case do
-      {:ok, member} -> member
-      {:error, error} -> raise "Failed to create member: #{inspect(error)}"
-    end
-  end
 end