diff --git a/BeWo/Core/Commands/CommandFactory.cs b/BeWo/Core/Commands/CommandFactory.cs
index 9027882ee..e12f74924 100644
--- a/BeWo/Core/Commands/CommandFactory.cs
+++ b/BeWo/Core/Commands/CommandFactory.cs
@@ -15,7 +15,7 @@ namespace BeWo.Core.Commands
 		{
 			bool canExecute() =>
 				BeWoAppInfo.IsInAiMode &&
-				(BeWoApp.AppSettings?.ModuleAiEnabled ?? false) &&
+				(BeWoApp.AppSettings?.ModuleAiEnabled ?? BeWoApp.AppSettings?.ShowAI ?? false) &&
 				BeWoApp.HasLoggedOnUserRight(userRightType) &&
 				(additionalCheckup is null || additionalCheckup());
 
diff --git a/BeWo/ViewModel/UserGroupVM.cs b/BeWo/ViewModel/UserGroupVM.cs
index 896df0c72..3a36ab64b 100644
--- a/BeWo/ViewModel/UserGroupVM.cs
+++ b/BeWo/ViewModel/UserGroupVM.cs
@@ -101,7 +101,7 @@ namespace BeWo.ViewModel
 			{IsUnterschriftRight, false},
 			{(r) => r == UserRightType.SupportConcept_ImportData, BeWoApp.AppSettings.ShowPersehImport},
 			{(r) => r == UserRightType.AiChatInZeiterfassung, BeWoApp.AppSettings.ShowAI},
-			{IsAiModuleRight, BeWoApp.AppSettings.ModuleAiEnabled},
+			{IsAiModuleRight, BeWoApp.AppSettings.ModuleAiEnabled || BeWoApp.AppSettings.ShowAI},
 			{IsAiModuleSettingRight, BeWoApp.AppSettings.ModuleAiSettingsEnabled},
 		};