diff --git a/b0esche_cloud/lib/widgets/organization_settings_dialog.dart b/b0esche_cloud/lib/widgets/organization_settings_dialog.dart
index 419e059..824d750 100644
--- a/b0esche_cloud/lib/widgets/organization_settings_dialog.dart
+++ b/b0esche_cloud/lib/widgets/organization_settings_dialog.dart
@@ -36,13 +36,21 @@ class _OrganizationSettingsDialogState
   bool _isLoading = false;
   String? _error;
   List<User> _userSuggestions = [];
+  late final TextEditingController usernameController;
 
   @override
   void initState() {
     super.initState();
+    usernameController = TextEditingController();
     _loadData();
   }
 
+  @override
+  void dispose() {
+    usernameController.dispose();
+    super.dispose();
+  }
+
   Future<void> _loadData() async {
     if (!mounted) return;
     setState(() => _isLoading = true);
@@ -407,7 +415,6 @@ class _OrganizationSettingsDialogState
   }
 
   Widget _buildInviteTab() {
-    final usernameController = TextEditingController();
     String selectedRole = 'member';
 
     return Column(