diff --git a/b0esche_cloud/lib/pages/home_page.dart b/b0esche_cloud/lib/pages/home_page.dart
index 5beb94a..87444df 100644
--- a/b0esche_cloud/lib/pages/home_page.dart
+++ b/b0esche_cloud/lib/pages/home_page.dart
@@ -603,6 +603,10 @@ class _HomePageState extends State<HomePage> with TickerProviderStateMixin {
                                                 path: '/',
                                               ),
                                             );
+                                            // Reload permissions when org changes
+                                            context.read<PermissionBloc>().add(
+                                              LoadPermissions(orgId: orgId),
+                                            );
                                           }
                                         },
                                         child:
diff --git a/b0esche_cloud/lib/widgets/organization_settings_dialog.dart b/b0esche_cloud/lib/widgets/organization_settings_dialog.dart
index ea1b198..913a320 100644
--- a/b0esche_cloud/lib/widgets/organization_settings_dialog.dart
+++ b/b0esche_cloud/lib/widgets/organization_settings_dialog.dart
@@ -495,40 +495,44 @@ class _OrganizationSettingsDialogState
           ),
         ),
         const SizedBox(height: 16),
-        Container(
-          decoration: BoxDecoration(
-            border: Border.all(
-              color: AppTheme.accentColor.withValues(alpha: 0.3),
+        TextField(
+          controller: usernameController,
+          cursorColor: AppTheme.accentColor,
+          decoration: InputDecoration(
+            hintText: 'Username',
+            hintStyle: TextStyle(color: AppTheme.secondaryText),
+            contentPadding: const EdgeInsets.all(12),
+            border: OutlineInputBorder(
+              borderSide: BorderSide(
+                color: AppTheme.accentColor.withValues(alpha: 0.3),
+              ),
+            ),
+            enabledBorder: OutlineInputBorder(
+              borderSide: BorderSide(
+                color: AppTheme.accentColor.withValues(alpha: 0.3),
+              ),
+            ),
+            focusedBorder: OutlineInputBorder(
+              borderSide: BorderSide(color: AppTheme.accentColor),
             ),
-            borderRadius: BorderRadius.circular(8),
           ),
-          child: TextField(
-            controller: usernameController,
-            cursorColor: AppTheme.accentColor,
-            decoration: InputDecoration(
-              hintText: 'Username',
-              hintStyle: TextStyle(color: AppTheme.secondaryText),
-              contentPadding: const EdgeInsets.all(12),
-              border: InputBorder.none,
-            ),
-            style: TextStyle(color: AppTheme.primaryText),
-            onChanged: (value) async {
-              if (value.length > 2) {
-                try {
-                  _userSuggestions = await widget.orgApi.searchUsers(
-                    widget.organization.id,
-                    value,
-                  );
-                } catch (e) {
-                  _userSuggestions = [];
-                }
-                setState(() {});
-              } else {
+          style: TextStyle(color: AppTheme.primaryText),
+          onChanged: (value) async {
+            if (value.length > 2) {
+              try {
+                _userSuggestions = await widget.orgApi.searchUsers(
+                  widget.organization.id,
+                  value,
+                );
+              } catch (e) {
                 _userSuggestions = [];
-                setState(() {});
               }
-            },
-          ),
+              setState(() {});
+            } else {
+              _userSuggestions = [];
+              setState(() {});
+            }
+          },
         ),
         const SizedBox(height: 8),
         if (_userSuggestions.isNotEmpty) ...[