diff --git a/server.py b/server.py
index 700b430b..11796fec 100644
--- a/server.py
+++ b/server.py
@@ -333,9 +333,9 @@ if args.chat or args.cai_chat:
                 context += f"{data['char_name']}'s Persona: {data['char_persona']}\n"
             if 'world_scenario' in data and data['world_scenario'] != '':
                 context += f"Scenario: {data['world_scenario']}\n"
-            context = f"{context.strip()}\n<START>"
+            context = f"{context.strip()}\n<START>\n"
             if 'example_dialogue' in data and data['example_dialogue'] != '':
-                context += f"{data['example_dialogue']}"
+                context += f"{data['example_dialogue'].strip()}\n"
             if 'char_greeting' in data:
                 history = [['', data['char_greeting']]]
         else:
diff --git a/settings-template.json b/settings-template.json
index e822c05b..25fad95e 100644
--- a/settings-template.json
+++ b/settings-template.json
@@ -5,11 +5,13 @@
     "preset": "NovelAI-Sphinx Moth",
     "name1": "Person 1",
     "name2": "Person 2",
-    "name1_pygmalion": "You",
-    "name2_pygmalion": "Kawaii",
     "context": "This is a conversation between two people.",
-    "context_pygmalion": "This is a conversation between two people.\n<START>",
     "prompt": "Common sense questions and answers\n\nQuestion: \nFactual answer:",
     "prompt_gpt4chan": "-----\n--- 865467536\nInput text\n--- 865467537\n",
-    "stop_at_newline": true
+    "stop_at_newline": true,
+    "preset_pygmalion": "Pygmalion",
+    "name1_pygmalion": "You",
+    "name2_pygmalion": "Kawaii",
+    "context_pygmalion": "This is a conversation between two people.\n<START>",
+    "stop_at_newline_pygmalion": false
 }