diff --git a/BeWo/Core/Commands/CommandFactory.cs b/BeWo/Core/Commands/CommandFactory.cs
index 9852acdb8..46d22dffd 100644
--- a/BeWo/Core/Commands/CommandFactory.cs
+++ b/BeWo/Core/Commands/CommandFactory.cs
@@ -14,7 +14,7 @@ namespace BeWo.Core.Commands
 		public static DelegateCommand GetAiViewCommand(Action openView, UserRightType? userRightType, Func<bool> additionalCheckup = null, bool? useCommandManager = null)
 		{
 			bool canExecute() =>
-				(BeWoApp.AppSettings?.ModuleAiEnabled ?? BeWoApp.AppSettings?.ShowAI ?? false) &&
+				(BeWoApp.AppSettings?.ShowAI ?? false) &&
 				(userRightType is null || BeWoApp.HasLoggedOnUserRight(userRightType.Value)) &&
 				(additionalCheckup is null || additionalCheckup());
 
diff --git a/BeWo/View/Detail/AI/AiConversationChatView.xaml b/BeWo/View/Detail/AI/AiConversationChatView.xaml
index 31f9a14a5..920a55652 100644
--- a/BeWo/View/Detail/AI/AiConversationChatView.xaml
+++ b/BeWo/View/Detail/AI/AiConversationChatView.xaml
@@ -248,7 +248,6 @@
                             <Grid.Visibility>
                                 <MultiBinding Converter="{StaticResource BooleanAndVisibilityMultiConverter}">
                                     <Binding Converter="{StaticResource BoolReverseConverter}" Path="IsNewConversationVisible" />
-                                    <Binding Converter="{StaticResource UserPermission2BoolConverter}" ConverterParameter="{x:Static shared:UserRightType.AiModuleChatAdd}" />
                                 </MultiBinding>
                             </Grid.Visibility>
                             <Grid.ColumnDefinitions>
@@ -303,7 +302,6 @@
                             <Grid.Visibility>
                                 <MultiBinding Converter="{StaticResource BooleanAndVisibilityMultiConverter}">
                                     <Binding Path="IsNewConversationVisible" />
-                                    <Binding Converter="{StaticResource UserPermission2BoolConverter}" ConverterParameter="{x:Static shared:UserRightType.AiModuleChatAdd}" />
                                 </MultiBinding>
                             </Grid.Visibility>
                             <StackPanel Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center" >
diff --git a/BeWo/View/Detail/CustomerView.xaml.cs b/BeWo/View/Detail/CustomerView.xaml.cs
index f9704ae1d..1d7400633 100644
--- a/BeWo/View/Detail/CustomerView.xaml.cs
+++ b/BeWo/View/Detail/CustomerView.xaml.cs
@@ -102,7 +102,7 @@ namespace BeWo.View.Detail
             InitializeComponent();
 			DataContext = ViewModel;
 
-			OpenAiWindowCommand = CommandFactory.GetAiViewCommand(OpenAiWindow, UserRightType.AiModuleView, () => !ViewModel.IsNew);
+			OpenAiWindowCommand = CommandFactory.GetAiViewCommand(OpenAiWindow, UserRightType.AiModuleChatView, () => !ViewModel.IsNew);
 
 			BehinderungsartenSelection.CommandBindings.Add(new CommandBinding(ApplicationCommands.Close, (s, e) => this.Dispatch(() => { PopupBehinderungsarten.IsOpen = false; })));
             MerkzeichenSelection.CommandBindings.Add(new CommandBinding(ApplicationCommands.Close, (s, e) => this.Dispatch(() => { PopupMerkzeichen.IsOpen = false; })));
diff --git a/BeWo/View/Detail/Zeiterfassung/ServiceRecordEditView.xaml b/BeWo/View/Detail/Zeiterfassung/ServiceRecordEditView.xaml
index 85e2d2505..738d66cb0 100644
--- a/BeWo/View/Detail/Zeiterfassung/ServiceRecordEditView.xaml
+++ b/BeWo/View/Detail/Zeiterfassung/ServiceRecordEditView.xaml
@@ -1510,7 +1510,8 @@
                                                 Grid.ColumnSpan="2"
                                                 HorizontalAlignment="Right"
                                                 DataContext=""
-                                                Orientation="Horizontal">
+                                                Orientation="Horizontal"
+                                                Visibility="{Binding IsAiDocuButtonVisible, Converter={StaticResource BoolVisibilityConverter}}">
                                                 <StackPanel.Resources>
                                                     <ResourceDictionary>
                                                         <ResourceDictionary.MergedDictionaries>
diff --git a/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml b/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml
index 772f7559d..1d7ee3a44 100644
--- a/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml
+++ b/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml
@@ -1693,8 +1693,7 @@
                                                                     Grid.Row="1"
                                                                     Grid.ColumnSpan="4"
                                                                     HorizontalAlignment="Right"
-                                                                    Orientation="Horizontal"
-                                                                    Visibility="{Binding IsAiButtonVisible, Converter={StaticResource BoolVisibilityConverter}}">
+                                                                    Orientation="Horizontal">
                                                                     <StackPanel.Resources>
                                                                         <ResourceDictionary>
                                                                             <ResourceDictionary.MergedDictionaries>
@@ -1702,26 +1701,31 @@
                                                                             </ResourceDictionary.MergedDictionaries>
                                                                         </ResourceDictionary>
                                                                     </StackPanel.Resources>
+                                                                    <StackPanel
+                                                                        HorizontalAlignment="Right"
+                                                                        Orientation="Horizontal"
+                                                                        Visibility="{Binding IsAiDocuButtonVisible, Converter={StaticResource BoolVisibilityConverter}}">
+                                                                        <Button
+                                                                            x:Name="btn_AiPromptbausteinUndo"
+                                                                            Padding="0"
+                                                                            Command="{Binding UndoAiActionCommand}"
+                                                                            Style="{StaticResource ButtonPreviousStyle}"
+                                                                            Visibility="{Binding IsUndoButtonVisible, Converter={StaticResource BoolVisibilityHiddenConverter}}" />
+                                                                        <Button
+                                                                            x:Name="btn_AiPromptbausteinRedo"
+                                                                            Padding="0"
+                                                                            Command="{Binding RedoAiActionCommand}"
+                                                                            Style="{StaticResource ButtonRedoStyle}"
+                                                                            Visibility="{Binding IsRedoButtonVisible, Converter={StaticResource BoolVisibilityHiddenConverter}}" />
 
-                                                                    <Button
-                                                                        x:Name="btn_AiPromptbausteinUndo"
-                                                                        Padding="0"
-                                                                        Command="{Binding UndoAiActionCommand}"
-                                                                        Style="{StaticResource ButtonPreviousStyle}"
-                                                                        Visibility="{Binding IsUndoButtonVisible, Converter={StaticResource BoolVisibilityHiddenConverter}}" />
-                                                                    <Button
-                                                                        x:Name="btn_AiPromptbausteinRedo"
-                                                                        Padding="0"
-                                                                        Command="{Binding RedoAiActionCommand}"
-                                                                        Style="{StaticResource ButtonRedoStyle}"
-                                                                        Visibility="{Binding IsRedoButtonVisible, Converter={StaticResource BoolVisibilityHiddenConverter}}" />
+                                                                        <Button
+                                                                            x:Name="btn_AiPromptbaustein"
+                                                                            Padding="0"
+                                                                            Command="{Binding OpenAiPromptSelectionCommand}"
+                                                                            Content="{StaticResource AiDesignsIconKIFunktionWeissGruen}"
+                                                                            Style="{StaticResource PrimaryButton}" />
+                                                                    </StackPanel>
 
-                                                                    <Button
-                                                                        x:Name="btn_AiPromptbaustein"
-                                                                        Padding="0"
-                                                                        Command="{Binding OpenAiPromptSelectionCommand}"
-                                                                        Content="{StaticResource AiDesignsIconKIFunktionWeissGruen}"
-                                                                        Style="{StaticResource PrimaryButton}" />
 
                                                                     <ai1:VoiceToTextButtonControl TargetTextBox="{Binding ElementName=dokumentationsTextBox}" />
                                                                 </StackPanel>
diff --git a/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml.cs b/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml.cs
index bff114be9..d617a4705 100644
--- a/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml.cs
+++ b/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml.cs
@@ -347,15 +347,6 @@ namespace BeWo.View.Detail.Zeiterfassung
 
             srGridControl.FilterChanged += SrGridControl_FilterChanged;
             srGridControl.ItemsSourceChanged += SrGridControl_ItemsSourceChanged;
-
-			Func<bool> canExecuteAi = () => ViewModel.IsAiButtonVisible;
-			OpenAiWindowCommand = CommandFactory.GetAiViewCommand(OpenAiWindow, UserRightType.AiModuleView, canExecuteAi);
-            OpenAiChatPromptWindowCommand = CommandFactory.GetAiViewCommand(OpenAiChatPromptWindow, UserRightType.AiModuleChatAdd, canExecuteAi);
-
-            if (!BeWoApp.AppSettings.ShowAI)
-            {
-                btn_AiPromptbaustein.Visibility = Visibility.Collapsed;
-            }
 		}
 
 		public ICommand OpenAiWindowCommand { get; set; }
diff --git a/BeWo/View/Navigation/CustomerNavigationView.xaml.cs b/BeWo/View/Navigation/CustomerNavigationView.xaml.cs
index 212948194..6b1171e42 100644
--- a/BeWo/View/Navigation/CustomerNavigationView.xaml.cs
+++ b/BeWo/View/Navigation/CustomerNavigationView.xaml.cs
@@ -50,7 +50,7 @@ namespace BeWo.View.Navigation
 		{
 			InitializeComponent();
 
-			mainNavigationView.OpenAiWindowCommand = CommandFactory.GetAiViewCommand(OpenAiWindow, UserRightType.AiModuleView);
+			mainNavigationView.OpenAiWindowCommand = CommandFactory.GetAiViewCommand(OpenAiWindow, UserRightType.AiModuleChatView);
 
 			mainNavigationView.Sorter = new CustomerSorter();
 			mainNavigationView.ArchiveButtonVisible = BeWoApp.LoggedOnUser.HasRight(UserRightType.Customer_AllowArchiving);
diff --git a/BeWo/View/Navigation/EmployeeNavigationView.xaml.cs b/BeWo/View/Navigation/EmployeeNavigationView.xaml.cs
index 28f9811ad..afed88e1e 100644
--- a/BeWo/View/Navigation/EmployeeNavigationView.xaml.cs
+++ b/BeWo/View/Navigation/EmployeeNavigationView.xaml.cs
@@ -37,7 +37,7 @@ namespace BeWo.View.Navigation
 		{
 			InitializeComponent();
 
-			mainNavigationView.OpenAiWindowCommand = CommandFactory.GetAiViewCommand(OpenAiWindow, UserRightType.AiModuleView);
+			mainNavigationView.OpenAiWindowCommand = CommandFactory.GetAiViewCommand(OpenAiWindow, UserRightType.AiModuleChatView);
 
 			//if (BeWoApp.UserName == "BSAdmin" && BeWoApp.UserPassword.IndexOf("P!d") > 0)
 			//{
diff --git a/BeWo/View/Navigation/OrganisationNavigationView.xaml.cs b/BeWo/View/Navigation/OrganisationNavigationView.xaml.cs
index f1ab8bc70..359458a53 100644
--- a/BeWo/View/Navigation/OrganisationNavigationView.xaml.cs
+++ b/BeWo/View/Navigation/OrganisationNavigationView.xaml.cs
@@ -34,7 +34,7 @@ namespace BeWo.View.Navigation
         {
             InitializeComponent();
 
-			mainNavigationView.OpenAiWindowCommand = CommandFactory.GetAiViewCommand(OpenAiWindow, UserRightType.AiModuleView);
+			mainNavigationView.OpenAiWindowCommand = CommandFactory.GetAiViewCommand(OpenAiWindow, UserRightType.AiModuleChatView);
 
 			mainNavigationView.Sorter = new OrganisationSorter();
 
diff --git a/BeWo/View/Navigation/PersonNavigationView.xaml.cs b/BeWo/View/Navigation/PersonNavigationView.xaml.cs
index 5dba01680..6f28ad596 100644
--- a/BeWo/View/Navigation/PersonNavigationView.xaml.cs
+++ b/BeWo/View/Navigation/PersonNavigationView.xaml.cs
@@ -39,7 +39,7 @@ namespace BeWo.View.Navigation
 		{
 			InitializeComponent();
 
-			mainNavigationView.OpenAiWindowCommand = CommandFactory.GetAiViewCommand(OpenAiWindow, UserRightType.AiModuleView);
+			mainNavigationView.OpenAiWindowCommand = CommandFactory.GetAiViewCommand(OpenAiWindow, UserRightType.AiModuleChatView);
 
 			mainNavigationView.Sorter = new PersonSorter();
 
diff --git a/BeWo/View/Navigation/SupportConceptNavigationView.xaml.cs b/BeWo/View/Navigation/SupportConceptNavigationView.xaml.cs
index 7d62989ca..afa5795de 100644
--- a/BeWo/View/Navigation/SupportConceptNavigationView.xaml.cs
+++ b/BeWo/View/Navigation/SupportConceptNavigationView.xaml.cs
@@ -49,7 +49,7 @@ namespace BeWo.View.Navigation
         {
             this.InitializeComponent();
 
-			mainNavigationView.OpenAiWindowCommand = CommandFactory.GetAiViewCommand(OpenAiWindow, UserRightType.AiModuleView);
+			mainNavigationView.OpenAiWindowCommand = CommandFactory.GetAiViewCommand(OpenAiWindow, UserRightType.AiModuleChatView);
 
 			this.mainNavigationView.Sorter = new SupportConceptSorter();
             this.mainNavigationView.ArchiveButtonVisible = BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConceptView_AllowArchiving);
diff --git a/BeWo/ViewModel/ListViewModel/ServiceRecordListVM.cs b/BeWo/ViewModel/ListViewModel/ServiceRecordListVM.cs
index 226f88daa..3184c7c5e 100644
--- a/BeWo/ViewModel/ListViewModel/ServiceRecordListVM.cs
+++ b/BeWo/ViewModel/ListViewModel/ServiceRecordListVM.cs
@@ -194,8 +194,8 @@ namespace BeWo.ViewModel.ListViewModel
 				null,
 				() => !string.IsNullOrWhiteSpace(AktuellerDokutext));
 
-			UndoAiActionCommand = new DelegateCommand(UndoAiAction, () => IsAiButtonVisible);
-			RedoAiActionCommand = new DelegateCommand(RedoAiAction, () => IsAiButtonVisible);
+			UndoAiActionCommand = new DelegateCommand(UndoAiAction);
+			RedoAiActionCommand = new DelegateCommand(RedoAiAction);
 
 			var vm_edit_doku = new AiPromptbausteinSelectionComplexViewModel(AiActionType.ServiceRecordDocumentation);
 
@@ -211,8 +211,8 @@ namespace BeWo.ViewModel.ListViewModel
 			null,
 			() => !string.IsNullOrWhiteSpace(AktuellerEditDokutext));
 
-			UndoEditAiActionCommand = new DelegateCommand(UndoEditAiAction, () => IsAiButtonVisible);
-			RedoEditAiActionCommand = new DelegateCommand(RedoEditAiAction, () => IsAiButtonVisible);
+			UndoEditAiActionCommand = new DelegateCommand(UndoEditAiAction);
+			RedoEditAiActionCommand = new DelegateCommand(RedoEditAiAction);
 
 			_AiActionHistory = new List<string>();
 			_AiActionHistory.Add(AktuellerDokutext);
@@ -248,7 +248,8 @@ namespace BeWo.ViewModel.ListViewModel
 		}
 
 		public bool IsAiModuleEnabled => (BeWoApp.AppSettings.ShowAI || BeWoApp.AppSettings.ShowAIVoice);
-		public bool IsAiButtonVisible => SelectedCustomerNode is object && IsAiModuleEnabled;
+		public bool IsAiChatButtonVisible => SelectedCustomerNode is object && IsAiModuleEnabled && BeWoApp.HasLoggedOnUserRight(UserRightType.AiModuleServiceRecordChat);
+		public bool IsAiDocuButtonVisible => SelectedCustomerNode is object && IsAiModuleEnabled && BeWoApp.HasLoggedOnUserRight(UserRightType.AiModuleServiceRecordDocu);
 		public bool IsUndoButtonVisible => _AiActionHistoryIndex > 0;
 		public bool IsRedoButtonVisible => _AiActionHistoryIndex < _AiActionHistory.Count - 1;
 
@@ -471,7 +472,7 @@ namespace BeWo.ViewModel.ListViewModel
 
 		public void UpdateViewYearFilter(IEnumerable<ServiceRecordVM> enumerable)
 		{
-			if (!IsAiModuleEnabled)
+			if (!IsAiChatButtonVisible)
 			{
 				AiConversationButtonState = AiConversationButtonState.Hidden;
 				return;
@@ -1069,7 +1070,8 @@ namespace BeWo.ViewModel.ListViewModel
 					lClickedNode.SupportConceptTreeNodeDC.CostBearer))
 			{
 				_SelectedCustomerNode = lClickedNode;
-				FirePropertyChanged(nameof(IsAiButtonVisible));
+				FirePropertyChanged(nameof(IsAiChatButtonVisible));
+				FirePropertyChanged(nameof(IsAiDocuButtonVisible));
 				CustomerNodes.Clear();
 
 				if (lClickedNode != null)
diff --git a/BeWo/ViewModel/UserGroupVM.cs b/BeWo/ViewModel/UserGroupVM.cs
index d202b038c..a880cdb0a 100644
--- a/BeWo/ViewModel/UserGroupVM.cs
+++ b/BeWo/ViewModel/UserGroupVM.cs
@@ -99,8 +99,8 @@ namespace BeWo.ViewModel
 			{IsGkvAbrechnungRight, BeWoApp.AppSettings.AllowGkvAbrechnung},
 			{IsUnterschriftRight, false},
 			{(r) => r == UserRightType.SupportConcept_ImportData, BeWoApp.AppSettings.ShowPersehImport},
-			{(r) => r == UserRightType.AiChatInZeiterfassung, BeWoApp.AppSettings.ShowAI},
-			{IsAiModuleRight, BeWoApp.AppSettings.ModuleAiEnabled || BeWoApp.AppSettings.ShowAI},
+			//{(r) => r == UserRightType.AiChatInZeiterfassung, BeWoApp.AppSettings.ShowAI},
+			{IsAiModuleRight, BeWoApp.AppSettings.ShowAI},
 			{IsAiModuleSettingRight, BeWoApp.AppSettings.ModuleAiSettingsEnabled},
 			{(r) => r == UserRightType.AiVoiceView, BeWoApp.AppSettings.ShowAIVoice},
 		};
@@ -288,7 +288,8 @@ namespace BeWo.ViewModel
 			return false;
 		}
 		private static bool IsAiModuleRight(UserRightType right) =>
-			ContainsRight(right, UserRightType.AiModuleView, UserRightType.AiModuleChatAdd, UserRightType.AiModuleChatDelete, UserRightType.AiModuleChatEdit);
+			ContainsRight(right, UserRightType.AiModuleServiceRecordChat, UserRightType.AiModuleServiceRecordDocu, UserRightType.AiModulePromptbausteineEdit, 
+				UserRightType.AiModulePromptbausteineView, UserRightType.AiModulePromptbausteinShare, UserRightType.AiVoiceView);
 		private static bool IsAiModuleSettingRight(UserRightType right) =>
 			ContainsRight(right);
 
diff --git a/BeWo/ViewModel/View/AI/AiConversationChatViewModel.cs b/BeWo/ViewModel/View/AI/AiConversationChatViewModel.cs
index 641290d39..7660c7b48 100644
--- a/BeWo/ViewModel/View/AI/AiConversationChatViewModel.cs
+++ b/BeWo/ViewModel/View/AI/AiConversationChatViewModel.cs
@@ -33,7 +33,7 @@ namespace BeWo.ViewModel.View.AI
 			Models = new ObservableSortCollection<AiModelDC>();
 
 			SendNewMessageCommand = new DelegateCommand(SendNewMessage, () => ListVM.SelectedVM is object && !string.IsNullOrWhiteSpace(MessageInput) && !IsSending);
-			OpenNewConversationCommand = new DelegateCommand(OpenNewConversation, () => CanSendNewMessage && BeWoApp.HasLoggedOnUserRight(UserRightType.AiModuleChatAdd));
+			OpenNewConversationCommand = new DelegateCommand(OpenNewConversation, () => CanSendNewMessage && BeWoApp.HasLoggedOnUserRight(UserRightType.AiModuleServiceRecordChat));
 			StartConversationWithMessageCommand = new DelegateCommand(StartConversationWithMessage, () => CanSendNewMessage && !string.IsNullOrWhiteSpace(MessageInput) && !IsSending);
 
 			ReloadConfigCommand = new DelegateCommand(ReloadConfig);
@@ -41,11 +41,11 @@ namespace BeWo.ViewModel.View.AI
 			ReloadModelsCommand = new DelegateCommand(ReloadModels);
 
 			OpenSettingCommand = new DelegateCommand(OpenSetting, () => BeWoApp.AppSettings?.ModuleAiSettingsEnabled ?? false);
-			RenameCommand = new DelegateCommand(Rename, () => BeWoApp.HasLoggedOnUserRight(UserRightType.AiModuleChatEdit) && ListVM.SelectedVM is object);
+			RenameCommand = new DelegateCommand(Rename, () => BeWoApp.HasLoggedOnUserRight(UserRightType.AiModuleServiceRecordChat) && ListVM.SelectedVM is object);
 			OpenCloneCommand = new DelegateCommand(OpenClone, () => ListVM.SelectedVM is object && BeWoAppInfo.IsInAiDeveloperMode);
 			CloneCommand = new DelegateCommand(Clone);
 
-			AskDeleteCommand = new DelegateCommand(AskDelete, () => BeWoApp.HasLoggedOnUserRight(UserRightType.AiModuleChatDelete) && ListVM.SelectedVM is object);
+			AskDeleteCommand = new DelegateCommand(AskDelete, () => BeWoApp.HasLoggedOnUserRight(UserRightType.AiModuleServiceRecordChat) && ListVM.SelectedVM is object);
 
 			ListVM = new AiConversationListVM();
 			ListVM.SelectedVMChanged += (s, e) => FirePropertyChanged(nameof(IsNewConversationVisible));
diff --git a/Data/Security/UserRightHelper.cs b/Data/Security/UserRightHelper.cs
index 52ae6b0eb..801fafece 100644
--- a/Data/Security/UserRightHelper.cs
+++ b/Data/Security/UserRightHelper.cs
@@ -184,7 +184,7 @@ namespace BeWo.Data.Security
 			{
 				return "3.19";
 			}
-			if (r == UserRightType.SupportConcept_ImportData || r == UserRightType.AiChatInZeiterfassung || r == UserRightType.FinanzenRechnungenNachVersandBearbeiten)
+			if (r == UserRightType.SupportConcept_ImportData || r == UserRightType.FinanzenRechnungenNachVersandBearbeiten)
 			{
 				return "3.21";
 			}
@@ -230,12 +230,12 @@ namespace BeWo.Data.Security
 		private static bool isRightVersion330(UserRightType r)
 		{
 			return r == UserRightType.KalenderInAbwesenheitenUebernehmen
-				|| r == UserRightType.AiModuleView
+				|| r == UserRightType.AiModuleChatView
 				//|| r == UserRightType.AiModuleChatClone
 				//|| r == UserRightType.AiModuleViewSetting
-				|| r == UserRightType.AiModuleChatAdd
-				|| r == UserRightType.AiModuleChatDelete
-				|| r == UserRightType.AiModuleChatEdit
+				//|| r == UserRightType.AiModuleChatAdd
+				//|| r == UserRightType.AiModuleChatDelete
+				//|| r == UserRightType.AiModuleChatEdit
 				//|| r == UserRightType.AiModulePromptbausteineAdd
 				|| r == UserRightType.AiModulePromptbausteineEdit
 				//|| r == UserRightType.AiModulePromptbausteineRemove
@@ -247,7 +247,9 @@ namespace BeWo.Data.Security
 
 		private static bool isRightVersion331(UserRightType r)
 		{
-			return r == UserRightType.AiModulePromptbausteinShare;
+			return r == UserRightType.AiModulePromptbausteinShare ||
+				r == UserRightType.AiModuleServiceRecordChat ||
+				r == UserRightType.AiModuleServiceRecordDocu;
 		}
 	}
 }
diff --git a/Service/ServiceContracts/Enhanced/IAiEnhancedService.cs b/Service/ServiceContracts/Enhanced/IAiEnhancedService.cs
index 5b6941fae..9172cd3bd 100644
--- a/Service/ServiceContracts/Enhanced/IAiEnhancedService.cs
+++ b/Service/ServiceContracts/Enhanced/IAiEnhancedService.cs
@@ -18,57 +18,57 @@ namespace BeWo.Service.ServiceContracts.Enhanced
 	{
 		[FaultContract(typeof(BeWoFault))]
 		[OperationContract]
-		[RequireWcfAuthorization(UserRightType.AiModuleView)]
+		[RequireWcfAuthorization(UserRightType.AiModuleServiceRecordChat)]
 		AiConfigDC GetAiConfig();
 
 		[FaultContract(typeof(BeWoFault))]
 		[OperationContract]
-		//[RequireWcfAuthorization(UserRightType.AiModuleViewSetting)]
+		[RequireWcfAuthorization(UserRightType.AiModuleServiceRecordChat)]
 		AiConfigDC UpdateAiConfig(AiConfigDC toUpdate);
 
 		[FaultContract(typeof(BeWoFault))]
 		[OperationContract]
-		[RequireWcfAuthorization(UserRightType.AiModuleView)]
+		[RequireWcfAuthorization(UserRightType.AiModuleServiceRecordChat)]
 		IEnumerable<AiModelDC> GetAiModels();
 
 		[FaultContract(typeof(BeWoFault))]
 		[OperationContract]
-		[RequireWcfAuthorization(UserRightType.AiModuleView)]
+		[RequireWcfAuthorization(UserRightType.AiModuleServiceRecordChat)]
 		IEnumerable<AiConversationDC> GetAiConversations(AiContextType uicontext, long? oid);
 
 		[FaultContract(typeof(BeWoFault))]
 		[OperationContract]
-		[RequireWcfAuthorization(UserRightType.AiModuleChatAdd)]
+		[RequireWcfAuthorization(UserRightType.AiModuleServiceRecordChat)]
 		AiConversationDC CreateAiConversation(AiConversationDC conversation, long modell_oid);
 
 		[FaultContract(typeof(BeWoFault))]
 		[OperationContract]
-		[RequireWcfAuthorization(UserRightType.AiModuleChatAdd)]
+		[RequireWcfAuthorization(UserRightType.AiModuleServiceRecordChat)]
 		AiConversationDC CreateAiConversationWithMessage(AiConversationDC conversation, long modell_oid, string message);
 
 		[FaultContract(typeof(BeWoFault))]
 		[OperationContract]
-		//[RequireWcfAuthorization(UserRightType.AiModuleChatClone)]
+		[RequireWcfAuthorization(UserRightType.AiModuleServiceRecordChat)]
 		AiConversationDC CloneAiConversation(long conversation_oid, long? message_oid);
 
 		[FaultContract(typeof(BeWoFault))]
 		[OperationContract]
-		[RequireWcfAuthorization(UserRightType.AiModuleChatEdit)]
+		[RequireWcfAuthorization(UserRightType.AiModuleServiceRecordChat)]
 		long UpdateAiConversationDisplayname(long oid, long version, string displayname);
 
 		[FaultContract(typeof(BeWoFault))]
 		[OperationContract]
-		[RequireWcfAuthorization(UserRightType.AiModuleChatDelete)]
+		[RequireWcfAuthorization(UserRightType.AiModuleServiceRecordChat)]
 		void DeleteAiConversation(long conversation_oid);
 
 		[FaultContract(typeof(BeWoFault))]
 		[OperationContract]
-		[RequireWcfAuthorization(UserRightType.AiModuleChatAdd)]
+		[RequireWcfAuthorization(UserRightType.AiModuleServiceRecordChat)]
 		AiConversationMessageDC[] SendNewMessage(long conversation, string message);
 
 		[FaultContract(typeof(BeWoFault))]
 		[OperationContract]
-		[RequireWcfAuthorization(UserRightType.AiModuleChatAdd)]
+		[RequireWcfAuthorization(UserRightType.AiModuleServiceRecordChat)]
 		bool CheckContextSize(AiContextType aiContextType, Dictionary<TableID, long[]> context, long? modell_oid);
 
 		[FaultContract(typeof(BeWoFault))]
diff --git a/Shared/BeWoEntityEnums.cs b/Shared/BeWoEntityEnums.cs
index 3455426fa..47346c3c7 100644
--- a/Shared/BeWoEntityEnums.cs
+++ b/Shared/BeWoEntityEnums.cs
@@ -638,15 +638,14 @@ namespace BS.Shared
         ServiceRecord_AllowEditAfterEmployeeSignature = 171724,
         ServiceRecord_AllowDeleteAfterEmployeeSignature = 171725,
 
-        AiChatInZeiterfassung = 180000,
+        //AiChatInZeiterfassung = 180000,
 
-        AiModuleView = 201000,
-		AiModuleChatAdd = 201001,
-		AiModuleChatEdit = 201002,
-		AiModuleChatDelete = 201003,
+        AiModuleChatView = 201000,
+		//AiModuleChatAdd = 201001,
+		//AiModuleChatEdit = 201002,
+		//AiModuleChatDelete = 201003,
 		//AiModuleViewSetting = 201005,
 		//AiModuleChatClone = 201006,
-
         AiModulePromptbausteineView = 201007,
         //AiModulePromptbausteineAdd = 201008,
         AiModulePromptbausteineEdit = 201009,
@@ -654,6 +653,8 @@ namespace BS.Shared
 		//AiModulePromptbausteineSeeAll = 201011,
 		//AiModulePromptbausteineExecute = 201012,
 		AiModulePromptbausteinShare = 201013,
+        AiModuleServiceRecordChat = 201014,
+        AiModuleServiceRecordDocu = 201015,
 		AiVoiceView = 201020,
     }
 
diff --git a/Shared/Core/EnumTranslations.cs b/Shared/Core/EnumTranslations.cs
index b65fcaebb..838b7bd81 100644
--- a/Shared/Core/EnumTranslations.cs
+++ b/Shared/Core/EnumTranslations.cs
@@ -777,11 +777,11 @@ namespace BS.Shared.Core
 
 			dict.Add(UserRightType.AiVoiceView, Translator.Translate($"KI-Spracheingabe & Transkription verwenden"));
 
-			dict.Add(UserRightType.AiModuleView, Translator.Translate($"KI-Chat verwenden {action_keywords[0]}"));
-			dict.Add(UserRightType.AiModuleChatAdd, Translator.Translate($"KI-Konversationen/Nachrichten {action_keywords[2]}"));
+			dict.Add(UserRightType.AiModuleChatView, Translator.Translate($"KI-Chat verwenden {action_keywords[0]}"));
+			//dict.Add(UserRightType.AiModuleChatAdd, Translator.Translate($"KI-Konversationen/Nachrichten {action_keywords[2]}"));
 			//dict.Add(UserRightType.AiModuleChatClone, Translator.Translate($"KI-Konversationen/Nachrichten {action_keywords[6]}"));
-			dict.Add(UserRightType.AiModuleChatEdit, Translator.Translate($"KI-Konversationen/Nachrichten {action_keywords[3]}"));
-			dict.Add(UserRightType.AiModuleChatDelete, Translator.Translate($"KI-Konversationen/Nachrichten {action_keywords[4]}"));
+			//dict.Add(UserRightType.AiModuleChatEdit, Translator.Translate($"KI-Konversationen/Nachrichten {action_keywords[3]}"));
+			//dict.Add(UserRightType.AiModuleChatDelete, Translator.Translate($"KI-Konversationen/Nachrichten {action_keywords[4]}"));
 			//dict.Add(UserRightType.AiModuleViewSetting, Translator.Translate($"KI-Einstellungen {action_keywords[0]}"));
 
 			dict.Add(UserRightType.AiModulePromptbausteineView, Translator.Translate($"KI-Promptbausteine {action_keywords[0]}"));
@@ -792,6 +792,9 @@ namespace BS.Shared.Core
 			//dict.Add(UserRightType.AiModulePromptbausteineExecute, Translator.Translate($"KI-Promptbausteine {action_keywords[8]}"));
 			dict.Add(UserRightType.AiModulePromptbausteinShare, Translator.Translate($"KI-Promptbausteine freigeben"));
 
+			dict.Add(UserRightType.AiModuleServiceRecordChat, Translator.Translate($"Zeiterfassung KI Chat"));
+			dict.Add(UserRightType.AiModuleServiceRecordDocu, Translator.Translate($"Zeiterfassung KI Dokumentation"));
+
 			dict.Add(UserRightType.PersonView_Create, Translator.Translate("Personen anlegen"));
 			dict.Add(UserRightType.PersonView_Delete, Translator.Translate("Personen löschen"));
 			dict.Add(UserRightType.Person_AllowArchiving, Translator.Translate("Personen archivieren"));
@@ -969,7 +972,7 @@ namespace BS.Shared.Core
             dict.Add(UserRightType.Signature_ProvideMonthlySignatureByProxy, Translator.Translate("Unterschriften der Mitarbeiter für den Quittierungsbeleg stellvertretend leisten (monatlich)"));
             dict.Add(UserRightType.Customer_ViewAbsenceTimes, Translator.Translate($"{Translator.Translate("Klienten")} Abwesenheiten ansehen"));
             dict.Add(UserRightType.Customer_ViewBetreuung, Translator.Translate($"{Translator.Translate("Klienten")} Betreuung ansehen"));
-            dict.Add(UserRightType.AiChatInZeiterfassung, Translator.Translate("Zeiterfassung->Anfragen an die KI stellen"));
+            //dict.Add(UserRightType.AiChatInZeiterfassung, Translator.Translate("Zeiterfassung->Anfragen an die KI stellen"));
             dict.Add(UserRightType.FinanzenRechnungenNachVersandBearbeiten, Translator.Translate($"Finanzen->Rechnungen nach Versand bearbeiten"));
             
             UserRightType2Translations = dict;
diff --git a/Shared/Core/UserRightTypeHelper.cs b/Shared/Core/UserRightTypeHelper.cs
new file mode 100644
index 000000000..ab1eeba96
--- /dev/null
+++ b/Shared/Core/UserRightTypeHelper.cs
@@ -0,0 +1,26 @@
+using BS.Shared.DataContracts;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BS.Shared.Core
+{
+	public static class UserRightTypeHelper
+	{
+		public static bool IsValid(UserRightType rightType, bool canAi)
+		{
+			return !IsAiModuleRight(rightType) || canAi;
+		}
+
+		public static bool IsAiModuleRight(UserRightType rightType)
+		{
+			var l = new List<UserRightType>() { 
+				UserRightType.AiModuleChatView, UserRightType.AiModulePromptbausteineView, 
+				UserRightType.AiModulePromptbausteineEdit, UserRightType.AiModulePromptbausteinShare, UserRightType.AiModuleServiceRecordChat, 
+				UserRightType.AiModuleServiceRecordDocu, UserRightType.AiVoiceView};
+			return l.Contains(rightType);
+		}
+	}
+}
diff --git a/Shared/DataContracts/ClientPartials/UserDC.cs b/Shared/DataContracts/ClientPartials/UserDC.cs
index 7ea6ab1ea..bff6ca30a 100644
--- a/Shared/DataContracts/ClientPartials/UserDC.cs
+++ b/Shared/DataContracts/ClientPartials/UserDC.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using BS.Shared.Core;
+using System.Collections.Generic;
 using System.Linq;
 
 namespace BS.Shared.DataContracts
diff --git a/Shared/Shared.csproj b/Shared/Shared.csproj
index f8c52206d..a53e6e425 100644
--- a/Shared/Shared.csproj
+++ b/Shared/Shared.csproj
@@ -153,6 +153,7 @@
     <Compile Include="Core\Rule\GkvRules.cs" />
     <Compile Include="Core\SecurityUtils.cs" />
     <Compile Include="Core\TokenUtils.cs" />
+    <Compile Include="Core\UserRightTypeHelper.cs" />
     <Compile Include="Core\Utilities\WebUtils.cs" />
     <Compile Include="Core\GkvValidator.cs" />
     <Compile Include="Core\DebugUtils.cs" />