diff --git a/handlers/handlerpageedit.cpp b/handlers/handlerpageedit.cpp
index 8231bc1..492e36f 100644
--- a/handlers/handlerpageedit.cpp
+++ b/handlers/handlerpageedit.cpp
@@ -114,7 +114,7 @@ Response HandlerPageEdit::handleRequest(PageDao &pageDao, std::string pagename,
 			templatePage.setVar("content", newContent);
 			setPageVars(templatePage, pagename);
 			templatePage.setVar("title", createPageTitle("Preview: " + pagename));
-
+			templatePage.setVar("comment", r.post("comment"));
 			Response response;
 			response.setBody(templatePage.render());
 			return response;
diff --git a/template/quitesimple/page_creation b/template/quitesimple/page_creation
index 35981f0..2c65da2 100644
--- a/template/quitesimple/page_creation
+++ b/template/quitesimple/page_creation
@@ -5,10 +5,10 @@
 <button type="submit" name="do" value="preview">Preview</button>
 <textarea name="content" style="width: 100%;" rows=70>{qswiki:var:content}</textarea>
 <br><b>Comment:</b><br>
-<input type="text" name="comment" size=50><br>
+<input type="text" name="comment" size="50" value="{qswiki:var:comment}"/><br>
 <input type="hidden" name="csrf_token" value="{qswiki:var:csrf_token}"></input>
 <button type="submit" name="do" value="submit">Submit</button>
 <button type="submit" name="do" value="preview">Preview</button>
 </form>
 </main>
-{qswiki:include:general_footer}
\ No newline at end of file
+{qswiki:include:general_footer}
diff --git a/template/quitesimple/page_creation_preview b/template/quitesimple/page_creation_preview
index f765d83..f45251d 100644
--- a/template/quitesimple/page_creation_preview
+++ b/template/quitesimple/page_creation_preview
@@ -8,10 +8,10 @@ This is a preview of your changes:<br>
 <button type="submit" name="do" value="preview">Preview</button>
 <textarea name="content" style="width: 100%;" rows=70>{qswiki:var:content}</textarea>
 <br><b>Comment:</b><br>
-<input type="text" name="comment" size=50><br>
+<input type="text" name="comment" size="50" value="{qswiki:var:comment}"/><br>
 <input type="hidden" name="csrf_token" value="{qswiki:var:csrf_token}"></input>
 <button type="submit" name="do" value="submit">Submit</button>
 <button type="submit" name="do" value="preview">Preview</button>
 </form>
 </main>
-{qswiki:include:general_footer}
\ No newline at end of file
+{qswiki:include:general_footer}