diff --git a/public/script.js b/public/script.js
index 1a74fb971..a10f4d1fa 100644
--- a/public/script.js
+++ b/public/script.js
@@ -6353,14 +6353,20 @@ async function saveSettings(type) {
     });
 }
 
-export function setGenerationParamsFromPreset(preset) {
+export function setGenerationParamsFromPreset(preset, isMancerChange = null) {
     const needsUnlock = (preset.max_length ?? max_context) > MAX_CONTEXT_DEFAULT || (preset.genamt ?? amount_gen) > MAX_RESPONSE_DEFAULT;
     $('#max_context_unlocked').prop('checked', needsUnlock).trigger('change');
 
     if (preset.genamt !== undefined) {
         amount_gen = preset.genamt;
-        $('#amount_gen').val(amount_gen);
-        $('#amount_gen_counter').val(amount_gen);
+        if (isMancerChange) {
+            $('#amount_gen').attr('max', amount_gen);
+            $('#amount_gen_counter').val($('#amount_gen').val());
+        }
+        else {
+            $('#amount_gen').val(amount_gen);
+            $('#amount_gen_counter').val(amount_gen);
+        }
     }
 
     if (preset.max_length !== undefined) {
diff --git a/public/scripts/textgen-models.js b/public/scripts/textgen-models.js
index 0c580a3d4..c96ad4ce4 100644
--- a/public/scripts/textgen-models.js
+++ b/public/scripts/textgen-models.js
@@ -184,7 +184,7 @@ function onMancerModelSelect() {
     $('#api_button_textgenerationwebui').trigger('click');
 
     const limits = mancerModels.find(x => x.id === modelId)?.limits;
-    setGenerationParamsFromPreset({ max_length: limits.context, genamt: limits.completion });
+    setGenerationParamsFromPreset({ max_length: limits.context, genamt: limits.completion }, true);
 }
 
 function onTogetherModelSelect() {
@@ -461,7 +461,7 @@ jQuery(function () {
             searchInputPlaceholder: 'Search models...',
             searchInputCssClass: 'text_pole',
             width: '100%',
-            templateResult:  getDreamGenModelTemplate,
+            templateResult: getDreamGenModelTemplate,
         });
         $('#openrouter_model').select2({
             placeholder: 'Select a model',