diff --git a/BeWo/View/Detail/AI/AiPromptbausteinComplexTreeView.xaml b/BeWo/View/Detail/AI/AiPromptbausteinComplexTreeView.xaml
index 3c916d1a0..f36c2b3c9 100644
--- a/BeWo/View/Detail/AI/AiPromptbausteinComplexTreeView.xaml
+++ b/BeWo/View/Detail/AI/AiPromptbausteinComplexTreeView.xaml
@@ -62,7 +62,7 @@
                     Content="Bearbeiten aktivieren"
                     IsChecked="{Binding IsEditingMode}"
                     ToolTip="Wenn der Bearbeiten Modus aktiviert ist, können Sie Elemente mit Drag und Drop verschieben"
-                    Visibility="Visible" />
+                    Visibility="Collapsed" />
 
                 <Button
                     Style="{StaticResource ButtonPreviousStyle}"
diff --git a/BeWo/ViewModel/View/Administration/AiPromptbausteinComplexTreeViewModel.cs b/BeWo/ViewModel/View/Administration/AiPromptbausteinComplexTreeViewModel.cs
index fd66c437b..31d118857 100644
--- a/BeWo/ViewModel/View/Administration/AiPromptbausteinComplexTreeViewModel.cs
+++ b/BeWo/ViewModel/View/Administration/AiPromptbausteinComplexTreeViewModel.cs
@@ -81,7 +81,7 @@ namespace BeWo.ViewModel.View.Administration
 			DeletePromptCommand = new DelegateCommand(OpenDeletePromptDialog, canOpenDeletePromptDialog, false);
 			ChangeFavoritenStatePromptCommand = new DelegateCommand(ChangeFavoritenStatePrompt, canChangeFavoritenStatePrompt, false);
 
-			IsEditingMode = true;
+			IsEditingMode = BeWoApp.HasLoggedOnUserRight(UserRightType.AiModulePromptbausteineEdit);
 		}
 
 		public override bool IsDirty
@@ -280,6 +280,7 @@ namespace BeWo.ViewModel.View.Administration
 		{
 			var sel_folder = SelectedFolder;
 			var sel_dc = sel_folder.CopyToEmptyDataContract();
+			sel_dc.CanEdit = SelectedFolder.CanEdit;
 			var edit_vm = new AiPromptbausteinFolderVM(sel_dc);
 
 			var vm = new AiPromptbausteinFolderViewModel(edit_vm, false);
@@ -363,6 +364,7 @@ namespace BeWo.ViewModel.View.Administration
 		{
 			var sel_prompt = SelectedPrompt;
 			var sel_dc = sel_prompt.CopyToEmptyDataContract();
+			sel_dc.CanEdit = SelectedPrompt.CanEdit;
 			var edit_vm = new AiPromptbausteinPromptVM(sel_dc);
 
 			var vm = new AiPromptbausteinPromptViewModel(edit_vm, false);
@@ -412,6 +414,7 @@ namespace BeWo.ViewModel.View.Administration
 			copied_dc.Version = 0;
 			copied_dc.ParentFolderOid = SelectedFolder.DataContract.Oid;
 			copied_dc.ActionType = AiActionType;
+			copied_dc.PromptId = null;
 			var copied_vm = new AiPromptbausteinPromptVM(copied_dc);
 
 			SelectedFolder.SubPrompts.VMList.Add(copied_vm);
diff --git a/Data/Security/UserRightHelper.cs b/Data/Security/UserRightHelper.cs
index ad24c2a7b..52ae6b0eb 100644
--- a/Data/Security/UserRightHelper.cs
+++ b/Data/Security/UserRightHelper.cs
@@ -236,9 +236,9 @@ namespace BeWo.Data.Security
 				|| r == UserRightType.AiModuleChatAdd
 				|| r == UserRightType.AiModuleChatDelete
 				|| r == UserRightType.AiModuleChatEdit
-				|| r == UserRightType.AiModulePromptbausteineAdd
+				//|| r == UserRightType.AiModulePromptbausteineAdd
 				|| r == UserRightType.AiModulePromptbausteineEdit
-				|| r == UserRightType.AiModulePromptbausteineRemove
+				//|| r == UserRightType.AiModulePromptbausteineRemove
 				//|| r == UserRightType.AiModulePromptbausteineSeeAll
 				|| r == UserRightType.AiModulePromptbausteineView
 				//|| r == UserRightType.AiModulePromptbausteineExecute
diff --git a/Service/ServiceContracts/Enhanced/IAiEnhancedService.cs b/Service/ServiceContracts/Enhanced/IAiEnhancedService.cs
index 7eaa1141b..5b6941fae 100644
--- a/Service/ServiceContracts/Enhanced/IAiEnhancedService.cs
+++ b/Service/ServiceContracts/Enhanced/IAiEnhancedService.cs
@@ -78,12 +78,12 @@ namespace BeWo.Service.ServiceContracts.Enhanced
 
 		[FaultContract(typeof(BeWoFault))]
 		[OperationContract]
-		[RequireWcfAuthorization(UserRightType.AiModulePromptbausteineAdd)]
+		[RequireWcfAuthorization(UserRightType.AiModulePromptbausteineEdit)]
 		IEnumerable<AiPromptbausteinFolderDC> InsertAiPromptbausteinFolder(IEnumerable<AiPromptbausteinFolderDC> folders);
 
 		[FaultContract(typeof(BeWoFault))]
 		[OperationContract]
-		[RequireWcfAuthorization(UserRightType.AiModulePromptbausteineAdd)]
+		[RequireWcfAuthorization(UserRightType.AiModulePromptbausteineEdit)]
 		IEnumerable<AiPromptbausteinPromptDC> InsertAiPromptbausteinPrompt(IEnumerable<AiPromptbausteinPromptDC> prompts);
 
 		[FaultContract(typeof(BeWoFault))]
@@ -98,12 +98,12 @@ namespace BeWo.Service.ServiceContracts.Enhanced
 
 		[FaultContract(typeof(BeWoFault))]
 		[OperationContract]
-		[RequireWcfAuthorization(UserRightType.AiModulePromptbausteineRemove)]
+		[RequireWcfAuthorization(UserRightType.AiModulePromptbausteineEdit)]
 		void DeleteAiPromptbausteinFolder(Dictionary<long, long> oid2version);
 
 		[FaultContract(typeof(BeWoFault))]
 		[OperationContract]
-		[RequireWcfAuthorization(UserRightType.AiModulePromptbausteineRemove)]
+		[RequireWcfAuthorization(UserRightType.AiModulePromptbausteineEdit)]
 		void DeleteAiPromptbausteinPrompt(Dictionary<long, long> oid2version);
 
 		[FaultContract(typeof(BeWoFault))]
diff --git a/Shared/BeWoEntityEnums.cs b/Shared/BeWoEntityEnums.cs
index aee84c1c8..3455426fa 100644
--- a/Shared/BeWoEntityEnums.cs
+++ b/Shared/BeWoEntityEnums.cs
@@ -648,9 +648,9 @@ namespace BS.Shared
 		//AiModuleChatClone = 201006,
 
         AiModulePromptbausteineView = 201007,
-        AiModulePromptbausteineAdd = 201008,
+        //AiModulePromptbausteineAdd = 201008,
         AiModulePromptbausteineEdit = 201009,
-        AiModulePromptbausteineRemove = 201010,
+        //AiModulePromptbausteineRemove = 201010,
 		//AiModulePromptbausteineSeeAll = 201011,
 		//AiModulePromptbausteineExecute = 201012,
 		AiModulePromptbausteinShare = 201013,
diff --git a/Shared/Core/EnumTranslations.cs b/Shared/Core/EnumTranslations.cs
index f5b41a4ef..b65fcaebb 100644
--- a/Shared/Core/EnumTranslations.cs
+++ b/Shared/Core/EnumTranslations.cs
@@ -785,9 +785,9 @@ namespace BS.Shared.Core
 			//dict.Add(UserRightType.AiModuleViewSetting, Translator.Translate($"KI-Einstellungen {action_keywords[0]}"));
 
 			dict.Add(UserRightType.AiModulePromptbausteineView, Translator.Translate($"KI-Promptbausteine {action_keywords[0]}"));
-			dict.Add(UserRightType.AiModulePromptbausteineAdd, Translator.Translate($"KI-Promptbaustein {action_keywords[2]}"));
+			//dict.Add(UserRightType.AiModulePromptbausteineAdd, Translator.Translate($"KI-Promptbaustein {action_keywords[2]}"));
 			dict.Add(UserRightType.AiModulePromptbausteineEdit, Translator.Translate($"KI-Promptbaustein {action_keywords[3]}"));
-			dict.Add(UserRightType.AiModulePromptbausteineRemove, Translator.Translate($"KI-Promptbaustein {action_keywords[4]}"));
+			//dict.Add(UserRightType.AiModulePromptbausteineRemove, Translator.Translate($"KI-Promptbaustein {action_keywords[4]}"));
 			//dict.Add(UserRightType.AiModulePromptbausteineSeeAll, Translator.Translate($"KI-Promptbausteine {action_keywords[7]}"));
 			//dict.Add(UserRightType.AiModulePromptbausteineExecute, Translator.Translate($"KI-Promptbausteine {action_keywords[8]}"));
 			dict.Add(UserRightType.AiModulePromptbausteinShare, Translator.Translate($"KI-Promptbausteine freigeben"));