diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 6866f15c0..35f51b7c7 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -10,8 +10,9 @@
  - fix: testEnvironment.pl do not tests all modules (perlDreamer Consulting, LLC)
  - fix: Fixed a bug where the isCurrentPost tmpl_var would always be set to the 
    first post of the thread in stead of the current post. (Martin Kamerbeek / Oqapi)
- 
- 
+ - fix: Non-existant variables in CS templates (perlDreamer Consulting, LLC)
+
+
 7.3.5
  - fix: CSS error in css03.css (perlDreamer Consulting, LLC)
  - fix: event tooltips are now displaying properly in all browsers
diff --git a/docs/upgrades/templates-7.3.6/PBtmpl0000000000000068.tmpl b/docs/upgrades/templates-7.3.6/PBtmpl0000000000000068.tmpl
new file mode 100644
index 000000000..7c2e0afa2
--- /dev/null
+++ b/docs/upgrades/templates-7.3.6/PBtmpl0000000000000068.tmpl
@@ -0,0 +1,80 @@
+#PBtmpl0000000000000068
+<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
+
+<tmpl_if preview.title><p><b><tmpl_var preview.title></b></p></tmpl_if>
+<tmpl_unless isReply><tmpl_if preview.synopsis><p><i><tmpl_var preview.synopsis></i></p></tmpl_if></tmpl_unless>
+<tmpl_if preview.content><p><tmpl_var preview.content></p></tmpl_if>
+
+<tmpl_if isReply>
+	<h1><tmpl_var message.header.label></h1>
+<tmpl_else>
+	<h1><tmpl_var submission.header.label></h1>
+</tmpl_if>
+
+<tmpl_var form.header>
+<table class="defaultSubmissionForm">
+	<tmpl_if isNewPost>
+		<tmpl_if user.isVisitor>
+			<tr>
+				<td><tmpl_var visitorName.label></td>
+				<td><tmpl_var visitorName.form></td>
+			</tr>
+		</tmpl_if>
+	</tmpl_if>
+	<tr>
+		<td><tmpl_var title.label></td>
+		<td><tmpl_var title.form></td>
+	</tr>
+	<tmpl_unless isReply>
+		<tr>
+			<td><tmpl_var synopsis.label></td>
+			<td><tmpl_var synopsis.form></td>
+		</tr>
+	</tmpl_unless>
+	<tr>
+		<td><tmpl_var body.label></td>
+		<td><tmpl_var content.form></td>
+	</tr>
+	<tmpl_unless isReply>
+		<tmpl_if attachment.form>
+			<tr>
+				<td><tmpl_var attachment.label></td>
+				<td><tmpl_var attachment.form></td>
+			</tr>
+		</tmpl_if>
+	</tmpl_unless>
+	<tmpl_if isNewPost>
+		<tmpl_unless user.isVisitor>
+			<tr>
+				<td><tmpl_var subscribe.label></td>
+				<td><tmpl_var subscribe.form></td>
+			</tr>
+		</tmpl_unless>
+		<tmpl_if isNewThread>
+			<tmpl_if user.isModerator>
+				<tr>
+					<td><tmpl_var lock.label></td>
+					<td><tmpl_var lock.form></td>
+				</tr>
+				<tr>
+					<td><tmpl_var stick.label></td>
+					<td><tmpl_var sticky.form></td>
+				</tr>
+			</tmpl_if>
+		</tmpl_if>
+	</tmpl_if>
+	<tr>
+		<td></td>
+		<td><tmpl_if usePreview><tmpl_var form.preview></tmpl_if><tmpl_var form.submit></td>
+	</tr>
+</table>
+<tmpl_var form.footer>
+
+<tmpl_if isReply>
+	<div class="defaultSubmissionFormContent">
+	<b><tmpl_var reply.title></b><br /><br />
+	<tmpl_var reply.content>
+	</div>
+</tmpl_if>
+
+
diff --git a/docs/upgrades/templates-7.3.6/PBtmpl0000000000000122.tmpl b/docs/upgrades/templates-7.3.6/PBtmpl0000000000000122.tmpl
new file mode 100644
index 000000000..1afc3a6e5
--- /dev/null
+++ b/docs/upgrades/templates-7.3.6/PBtmpl0000000000000122.tmpl
@@ -0,0 +1,99 @@
+#PBtmpl0000000000000122
+<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
+
+<div class="jobSubmissionFormContent">
+	<tmpl_if preview.title><p><b><tmpl_var preview.title></b></p></tmpl_if>
+	<tmpl_if preview.content><p><tmpl_var preview.content></p></tmpl_if>
+	<tmpl_if preview.userDefined3><p><tmpl_var preview.userDefined3></p></tmpl_if>
+	<tmpl_if preview.userDefined1><p><tmpl_var preview.userDefined1></p></tmpl_if>
+	<tmpl_if preview.userDefined2><p><tmpl_var preview.userDefined2></p></tmpl_if>
+</div>
+
+<tmpl_if isReply>
+	<h2><tmpl_var message.header.label></h2>
+<tmpl_else>
+	<h2><tmpl_var job.header.label></h2>
+</tmpl_if>
+
+<tmpl_var form.header>
+<table class="jobSubmissionFormContent">
+	<tmpl_if isReply>
+		<tr>
+			<td><tmpl_var subject.label></td>
+			<td><tmpl_var title.form></td>
+		</tr>
+		<tr>
+			<td><tmpl_var message.label></td>
+			<td><tmpl_var content.form></td>
+		</tr>
+	<tmpl_else>
+		<tr>
+			<td><tmpl_var job.title.label></td>
+			<td><tmpl_var title.form></td>
+		</tr>
+		<tr>
+			<td><tmpl_var synopsis.label></td>
+			<td><tmpl_var synopsis.form></td>
+		</tr>
+		<tr>
+			<td><tmpl_var job.description.label></td>
+			<td><tmpl_var content.form></td>
+		</tr>
+		<tr>
+			<td><tmpl_var job.requirements.label></td>
+			<td><tmpl_var userDefined3.form.htmlarea></td>
+		</tr>
+		<tr>
+			<td><tmpl_var compensation.label></td>
+			<td><tmpl_var userDefined1.form></td>
+		</tr>
+		<tr>
+			<td><tmpl_var location.label></td>
+			<td><tmpl_var userDefined2.form></td>
+		</tr>
+		<tmpl_if attachment.form>
+			<tr>
+				<td><tmpl_var attachment.label></td>
+				<td><tmpl_var attachment.form></td>
+			</tr>
+		</tmpl_if>
+	</tmpl_if>
+	<tmpl_if isNewPost>
+		<tmpl_unless user.isVisitor>
+			<tr>
+				<td><tmpl_var subscribe.label></td>
+				<td><tmpl_var subscribe.form></td>
+			</tr>
+		</tmpl_unless>
+		<tmpl_if isNewThread>
+			<tmpl_if user.isModerator>
+				<tr>
+					<td><tmpl_var lock.label></td>
+					<td><tmpl_var lock.form></td>
+				</tr>
+				<tr>
+					<td><tmpl_var stick.label></td>
+					<td><tmpl_var sticky.form></td>
+				</tr>
+			</tmpl_if>
+		</tmpl_if>
+	</tmpl_if>
+	<tr>
+		<td></td>
+		<td><tmpl_if usePreview><tmpl_var form.preview></tmpl_if><tmpl_var form.submit></td>
+	</tr>
+</table>
+<tmpl_var form.footer>
+
+<tmpl_if isReply>
+	<div class="jobSubmissionFormContent">
+		<b><tmpl_var reply.title></b><br /><br />
+		<tmpl_var reply.content>
+		<tmpl_if reply.userDefined3><p><tmpl_var reply.userDefined3></p></tmpl_if>
+		<tmpl_if reply.userDefined1><p><tmpl_var reply.userDefined1></p></tmpl_if>
+		<tmpl_if reply.userDefined2><p><tmpl_var reply.userDefined2></p></tmpl_if>
+	</div>
+</tmpl_if>
+<p /><p />
+
+