diff --git a/public/index.html b/public/index.html
index 8d3e810c5..c98f88ed1 100644
--- a/public/index.html
+++ b/public/index.html
@@ -744,6 +744,10 @@
                     <input id="disable-personality-formatting-checkbox" type="checkbox" />
                     Disable personality formatting
                 </label>
+                <label class="checkbox_label" for="always-force-name2-checkbox">
+                    <input id="always-force-name2-checkbox" type="checkbox" />
+                    Always add character's name to prompt
+                </label>
             </div>
         </div>
 
diff --git a/public/notes/advanced_formatting.html b/public/notes/advanced_formatting.html
index 4f71a8f28..f59e690fa 100644
--- a/public/notes/advanced_formatting.html
+++ b/public/notes/advanced_formatting.html
@@ -32,6 +32,10 @@
             <p>
                 <code><b>Personality: </b></code> won't be prepended to the content your character's Personality box.
             </p>
+            <h4>Always add character's name to prompt</h4>
+            <p>
+                Doesn't do anything (Included in Pygmalion formatting).
+            </p>
             <h3>For <u>non-Pygmalion</u> models</h3>
             <h4>Disable description formatting</h4>
             <p>
@@ -45,6 +49,15 @@
             <p>
                 <code><b>NAME's personality: </b></code> won't be prepended to the content your character's Personality box.
             </p>
+            <h4>Always add character's name to prompt</h4>
+            <p>
+                Appends character's name to the prompt to force model to complete the message as a character:
+            </p>
+            
+            <code>
+                ** OTHER CONTEXT HERE **<br>
+                Character: 
+            </code>
         </div>
     </div>
 </body>
diff --git a/public/script.js b/public/script.js
index 6e1d9c275..4acad525c 100644
--- a/public/script.js
+++ b/public/script.js
@@ -44,6 +44,7 @@ import {
     disable_description_formatting,
     disable_personality_formatting,
     disable_scenario_formatting,
+    always_force_name2,
 } from "./scripts/power-user.js";
 
 import {
@@ -1094,6 +1095,11 @@ async function Generate(type, automatic_trigger, force_name2) {//encode("dsfs").
                 storyString += appendToStoryString(example, '');
             }
         }
+
+        if (always_force_name2) {
+            force_name2 = true;
+        }
+
         //////////////////////////////////
 
         var count_exm_add = 0;
diff --git a/public/scripts/power-user.js b/public/scripts/power-user.js
index a2a58678f..e1bdf4aec 100644
--- a/public/scripts/power-user.js
+++ b/public/scripts/power-user.js
@@ -6,6 +6,7 @@ export {
     disable_description_formatting,
     disable_scenario_formatting,
     disable_personality_formatting,
+    always_force_name2,
 };
 
 let collapse_newlines = false;
@@ -14,6 +15,7 @@ let pin_examples = false;
 let disable_description_formatting = false;
 let disable_scenario_formatting = false;
 let disable_personality_formatting = false;
+let always_force_name2 = false;
 
 const storage_keys = {
     collapse_newlines: "TavernAI_collapse_newlines",
@@ -22,6 +24,7 @@ const storage_keys = {
     disable_description_formatting: "TavernAI_disable_description_formatting",
     disable_scenario_formatting: "TavernAI_disable_scenario_formatting",
     disable_personality_formatting: "TavernAI_disable_personality_formatting",
+    always_force_name2: "TavernAI_always_force_name2",
 };
 
 function collapseNewlines(x) {
@@ -35,6 +38,7 @@ function loadPowerUserSettings() {
     disable_description_formatting = localStorage.getItem(storage_keys.disable_description_formatting) == "true";
     disable_scenario_formatting = localStorage.getItem(storage_keys.disable_scenario_formatting) == "true";
     disable_personality_formatting = localStorage.getItem(storage_keys.disable_personality_formatting) == "true";
+    always_force_name2 = localStorage.getItem(storage_keys.always_force_name2) == "true";
 
     $("#force-pygmalion-formatting-checkbox").prop("checked", force_pygmalion_formatting);
     $("#collapse-newlines-checkbox").prop("checked", collapse_newlines);
@@ -42,6 +46,7 @@ function loadPowerUserSettings() {
     $("#disable-description-formatting-checkbox").prop("checked", disable_description_formatting);
     $("#disable-scenario-formatting-checkbox").prop("checked", disable_scenario_formatting);
     $("#disable-personality-formatting-checkbox").prop("checked", disable_personality_formatting);
+    $("#always-force-name2-checkbox").prop("checked", always_force_name2);
 }
 
 $(document).ready(() => {
@@ -49,32 +54,37 @@ $(document).ready(() => {
     loadPowerUserSettings();
 
     $("#collapse-newlines-checkbox").change(function () {
-        collapse_newlines = !!$("#collapse-newlines-checkbox").prop("checked");
+        collapse_newlines = !!$(this).prop("checked");
         localStorage.setItem(storage_keys.collapse_newlines, collapse_newlines);
     });
 
     $("#force-pygmalion-formatting-checkbox").change(function () {
-        force_pygmalion_formatting = !!$("#force-pygmalion-formatting-checkbox").prop("checked");
+        force_pygmalion_formatting = !!$(this).prop("checked");
         localStorage.setItem(storage_keys.force_pygmalion_formatting, force_pygmalion_formatting);
     });
 
     $("#pin-examples-checkbox").change(function () {
-        pin_examples = !!$("#pin-examples-checkbox").prop("checked");
+        pin_examples = !!$(this).prop("checked");
         localStorage.setItem(storage_keys.force_pygmalion_formatting, pin_examples);
     });
 
     $("#disable-description-formatting-checkbox").change(function () {
-        disable_description_formatting = !!$("#disable-description-formatting-checkbox").prop('checked');
+        disable_description_formatting = !!$(this).prop('checked');
         localStorage.setItem(storage_keys.disable_description_formatting, disable_description_formatting);
     })
 
     $("#disable-scenario-formatting-checkbox").change(function () {
-        disable_scenario_formatting = !!$("#disable-scenario-formatting-checkbox").prop('checked');
+        disable_scenario_formatting = !!$(this).prop('checked');
         localStorage.setItem(storage_keys.disable_scenario_formatting, disable_scenario_formatting);
     });
 
     $("#disable-personality-formatting-checkbox").change(function () {
-        disable_personality_formatting = !!$("#disable-personality-formatting-checkbox").prop('checked');
+        disable_personality_formatting = !!$(this).prop('checked');
         localStorage.setItem(storage_keys.disable_personality_formatting, disable_personality_formatting);
     });
+
+    $("#always-force-name2-checkbox").change(function () {
+        always_force_name2 = !!$(this).prop("checked");
+        localStorage.setItem(storage_keys.always_force_name2, always_force_name2);
+    });
 });
\ No newline at end of file