From 9dfe95ff523a42177428010957dcd3244a8d331d Mon Sep 17 00:00:00 2001
From: Remco <Remcojandijkstra@ziggo.nl>
Date: Mon, 19 Jan 2026 21:38:46 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=86=99=20More=20fixes=20=F0=9F=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/Http/Requests/AccountSettingsFormRequest.php     | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Updated_Cms/app/Http/Requests/AccountSettingsFormRequest.php b/Updated_Cms/app/Http/Requests/AccountSettingsFormRequest.php
index a5abff49cd..bd67e07201 100644
--- a/Updated_Cms/app/Http/Requests/AccountSettingsFormRequest.php
+++ b/Updated_Cms/app/Http/Requests/AccountSettingsFormRequest.php
@@ -10,11 +10,16 @@ use RyanChandler\LaravelCloudflareTurnstile\Rules\Turnstile;
 
 class AccountSettingsFormRequest extends FormRequest
 {
+    /**
+     * @return array<string, array<int, string|\Illuminate\Contracts\Validation\ValidationRule|\Illuminate\Contracts\Validation\InvokableRule|\Illuminate\Contracts\Validation\Rule>>
+     */
     public function rules(): array
     {
+        $userId = $this->user()?->id;
+
         return [
-            'username' => ['sometimes', 'string', sprintf('regex:%s', setting('username_regex')), 'min:3', 'max:25', Rule::unique('users')->ignore($this->user()->id), new WebsiteWordfilterRule],
-            'mail' => ['required', 'email', Rule::unique('users')->ignore($this->user()->id), new WebsiteWordfilterRule],
+            'username' => ['sometimes', 'string', sprintf('regex:%s', setting('username_regex')), 'min:3', 'max:25', Rule::unique('users')->ignore($userId), new WebsiteWordfilterRule],
+            'mail' => ['required', 'email', Rule::unique('users')->ignore($userId), new WebsiteWordfilterRule],
             'motto' => ['nullable', 'string', 'max:127', new WebsiteWordfilterRule],
             'g-recaptcha-response' => [new GoogleRecaptchaRule],
             'cf-turnstile-response' => [app(Turnstile::class)],