From da638359023773294c8a1843df82a42cc0bde09e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Jaussoin?=
 <timothee.jaussoin@belledonne-communications.com>
Date: Wed, 15 Oct 2025 11:15:32 +0200
Subject: [PATCH] Fix FLEXIAPI-404 Prevent the account domain to be reset
 during creation on error

---
 flexiapi/resources/views/admin/account/create_edit.blade.php | 2 +-
 flexiapi/resources/views/admin/account/index.blade.php       | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/flexiapi/resources/views/admin/account/create_edit.blade.php b/flexiapi/resources/views/admin/account/create_edit.blade.php
index 6d63095..7406bec 100644
--- a/flexiapi/resources/views/admin/account/create_edit.blade.php
+++ b/flexiapi/resources/views/admin/account/create_edit.blade.php
@@ -42,7 +42,7 @@
         <div class="select">
             <select name="domain" @if (auth()->user()?->superAdmin) required @else disabled @endif>
                 @foreach ($domains as $space)
-                    <option value="{{ $space->domain }}" @if ($account->domain == $space->domain) selected="selected" @endif>
+                    <option value="{{ $space->domain }}" @if ($account->domain == $space->domain || old('domain') == $space->domain) selected="selected" @endif>
                         {{ $space->domain }}</option>
                 @endforeach
             </select>
diff --git a/flexiapi/resources/views/admin/account/index.blade.php b/flexiapi/resources/views/admin/account/index.blade.php
index f81728e..4ffef84 100644
--- a/flexiapi/resources/views/admin/account/index.blade.php
+++ b/flexiapi/resources/views/admin/account/index.blade.php
@@ -53,7 +53,9 @@
             </div>
             <div class="oppose">
                 <a href="{{ route('admin.account.index') }}" type="reset" class="btn tertiary">{{ __('Reset') }}</a>
-                <button type="submit" class="btn">{{ __('Search') }}</button>
+                <button type="submit" class="btn">
+                    <i class="ph ph-magnifying-glass"></i>
+                </button>
             </div>
         </form>
     </div>