diff --git a/phpBB/posting.php b/phpBB/posting.php
index 5f7060abb5..29832ee665 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -63,7 +63,9 @@ else
 
 			$pagetype = "newtopic";
 			$page_title = " $l_postnew";
-			$sql = "SELECT forum_name, forum_access FROM ".FORUMS_TABLE." WHERE forum_id = '$forum_id'";
+			$sql = "SELECT forum_name, forum_access 
+				FROM ".FORUMS_TABLE." 
+				WHERE forum_id = '$forum_id'";
 			if(!$result = $db->sql_query($sql))
 			{
 				error_die(SQL_QUERY, "Could not obtain forum/forum access information.", __LINE__, __FILE__);
@@ -152,27 +154,33 @@ else
 			}
 			$notify_toggle .= "> $l_notify";
 
+			$hidden_form_fields = "<input type=\"hidden\" name=\"mode\" value=\"$mode\"><input type=\"hidden\" name=\"forum_id\" value=\"$forum_id\"><input type=\"hidden\" name=\"topic_id\" value=\"$topic_id\">";
 
-			$template->assign_vars(array("L_ABOUTPOST" => $l_aboutpost,
-											"L_SUBJECT" => $l_subject,
-											"L_MESSAGEBODY" => $l_body,
-											"L_OPTIONS" => $l_options,
-											"L_PREVIEW" => $l_preview,
-											"L_SUBMIT" => $l_submit,
-											"L_CANCEL" => $l_cancelpost,
-											"MODE" => $mode,
-											"ABOUT_POSTING" => $about_posting,
-											"USERNAME_INPUT" => $username_input,
-											"PASSWORD_INPUT" => $password_input,
-											"SUBJECT_INPUT" => $subject_input,
-											"MESSAGE_INPUT" => $message_input,
-											"HTML_STATUS" => $html_status,
-											"HTML_TOGGLE" => $html_toggle,
-											"SMILE_TOGGLE" => $smile_toggle,
-											"SIG_TOGGLE" => $sig_toggle,
-											"NOTIFY_TOGGLE" => $notify_toggle,
-											"BBCODE_TOGGLE" => $bbcode_toggle,
-											"BBCODE_STATUS" => $bbcode_status));
+			$template->assign_vars(array(
+				"L_ABOUT_POST" => $l_aboutpost,
+				"L_SUBJECT" => $l_subject,
+				"L_MESSAGE_BODY" => $l_body,
+				"L_OPTIONS" => $l_options,
+				"L_PREVIEW" => $l_preview,
+				"L_SUBMIT" => $l_submit,
+				"L_CANCEL" => $l_cancelpost,
+
+				"ABOUT_POSTING" => $about_posting,
+				"USERNAME_INPUT" => $username_input,
+				"PASSWORD_INPUT" => $password_input,
+				"SUBJECT_INPUT" => $subject_input,
+				"MESSAGE_INPUT" => $message_input,
+				"HTML_STATUS" => $html_status,
+				"HTML_TOGGLE" => $html_toggle,
+				"SMILE_TOGGLE" => $smile_toggle,
+				"SIG_TOGGLE" => $sig_toggle,
+				"NOTIFY_TOGGLE" => $notify_toggle,
+				"BBCODE_TOGGLE" => $bbcode_toggle,
+				"BBCODE_STATUS" => $bbcode_status,
+				
+				"S_POST_ACTION" => append_sid("posting.$phpEx"),
+				"S_HIDDEN_FORM_FIELDS" => $hidden_form_fields)
+			);
 			$template->pparse("body");
 			include('includes/page_tail.'.$phpEx);
 	break;
diff --git a/phpBB/templates/Default/newtopic_header.tpl b/phpBB/templates/Default/newtopic_header.tpl
index 0e032ec54c..903fad68e8 100644
--- a/phpBB/templates/Default/newtopic_header.tpl
+++ b/phpBB/templates/Default/newtopic_header.tpl
@@ -7,7 +7,7 @@
 	        <tr>
                   <td align="center" style="{font-size: 8pt;}">
                     {L_POSTNEWIN}<br>
-	            <a href="viewforum.{PHPEX}?{S_FORUMS_URL}={FORUM_ID}">{FORUM_NAME}</a>
+	            <a href="{U_VIEW_FORUM}">{FORUM_NAME}</a>
 	          </td>
 	        </tr>
 	      </table>
diff --git a/phpBB/templates/Default/posting_body.tpl b/phpBB/templates/Default/posting_body.tpl
index 13cfc0acdd..c49b6292c3 100644
--- a/phpBB/templates/Default/posting_body.tpl
+++ b/phpBB/templates/Default/posting_body.tpl
@@ -1,11 +1,11 @@
 <tr>
-  <td><form action="posting.{PHPEX}" method="POST">
+  <td><form action="{S_POST_ACTION}" method="post">
    <table border="0" align="center" width="100%" bgcolor="#000000" cellpadding="0" cellspacing="1">
     <tr>
       <td>
          <table border="0" width="100%" cellpadding="3" cellspacing="1">
 	        <tr class="tablebody">
-	           <td bgcolor="#DDDDDD" width="15%">{L_ABOUTPOST}</td>
+	           <td bgcolor="#DDDDDD" width="15%">{L_ABOUT_POST}</td>
 	           <td bgcolor="#CCCCCC">{ABOUT_POSTING}</td>
 	        </tr>
                 <tr class="tablebody">
@@ -21,7 +21,7 @@
                    <td bgcolor="#CCCCCC">{SUBJECT_INPUT}</td>
                 </tr>
                 <tr class="tablebody">
-                    <td bgcolor="#DDDDDD">{L_MESSAGEBODY}<br><br>
+                    <td bgcolor="#DDDDDD">{L_MESSAGE_BODY}<br><br>
                       {HTML_STATUS}<br>{BBCODE_STATUS}</td>
                     <td bgcolor="#CCCCCC">{MESSAGE_INPUT}</td>
                 </tr>
@@ -30,14 +30,8 @@
                        <td bgcolor="#CCCCCC">
                        {HTML_TOGGLE}<br>{BBCODE_TOGGLE}<br>{SMILE_TOGGLE}<br>{SIG_TOGGLE}<br>{NOTIFY_TOGGLE}</td>
 		</tr>
-	        <tr class="tableheader">
-		   <td align="center" colspan="2">
-                   <input type="hidden" name="mode" value="{MODE}">
-                   <input type="hidden" name="forum_id" value="{FORUM_ID}">
-                   <input type="hidden" name="topic_id" value="{TOPIC_ID}">
-                   <input type="submit" name="preview" value="{L_PREVIEW}">&nbsp;
-                   <input type="submit" name="submit" value="{L_SUBMIT}">&nbsp;
-                   <input type="submit" name="cancel" value="{L_CANCEL}"></td>
+        <tr class="tableheader">
+		   <td align="center" colspan="2">{S_HIDDEN_POST_FIELDS}<input type="submit" name="preview" value="{L_PREVIEW}">&nbsp;<input type="submit" name="submit" value="{L_SUBMIT}">&nbsp;<input type="submit" name="cancel" value="{L_CANCEL}"></td>
 		</tr>
 	       </table>
 	      </td>
diff --git a/phpBB/templates/PSO/newtopic_header.tpl b/phpBB/templates/PSO/newtopic_header.tpl
index 46d88b0e40..2024cb7cdd 100644
--- a/phpBB/templates/PSO/newtopic_header.tpl
+++ b/phpBB/templates/PSO/newtopic_header.tpl
@@ -1,5 +1,5 @@
 <div align="center"><table width="98%" cellspacing="0" cellpadding="4" border="0">
 	<tr>
-		<td align="left"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}" color="{T_FONTCOLOR1}"><a href="/">{SITENAME}&nbsp;{L_INDEX}</a> -> {FORUM_NAME}</font></td>
+		<td align="left"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}" color="{T_FONTCOLOR1}"><a href="{U_INDEX}">{SITENAME}&nbsp;{L_INDEX}</a> -> {FORUM_NAME}</font></td>
 	</tr>
 </table></div>
\ No newline at end of file
diff --git a/phpBB/templates/PSO/posting_body.tpl b/phpBB/templates/PSO/posting_body.tpl
index 8e55473390..5aa7f15a1d 100644
--- a/phpBB/templates/PSO/posting_body.tpl
+++ b/phpBB/templates/PSO/posting_body.tpl
@@ -1,5 +1,5 @@
 <div align="center"><table width="98%" cellpadding="1" cellspacing="0" border="0">
-	<tr><form action="{PHP_SELF}" method="POST">
+	<tr><form action="{S_POST_ACTION}" method="POST">
 		<td bgcolor="{T_TH_COLOR1}"><table border="0" cellpadding="3" cellspacing="1" width="100%">
 			<tr>
 				<td colspan="2" bgcolor="{T_TH_COLOR3}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}"><b>Post a Topic</b></font></td>
@@ -17,7 +17,7 @@
 				<td bgcolor="{T_TD_COLOR2}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}">{HTML_TOGGLE}<br />{BBCODE_TOGGLE}<br />{SMILE_TOGGLE}<br />{SIG_TOGGLE}<br />{NOTIFY_TOGGLE}</font></td>
 			</tr>
 			<tr>
-				<td colspan="2" bgcolor="{T_TH_COLOR3}" align="center"><input type="hidden" name="mode" value="{MODE}"><input type="hidden" name="forum_id" value="{FORUM_ID}"><input type="hidden" name="topic_id" value="{TOPIC_ID}"><input type="submit" name="preview" value="{L_PREVIEW}">&nbsp;<input type="submit" name="submit" value="{L_SUBMIT}">&nbsp;<input type="submit" name="cancel" value="{L_CANCEL}"></td>
+				<td colspan="2" bgcolor="{T_TH_COLOR3}" align="center">{S_HIDDEN_FORM_FIELDS}<input type="submit" name="preview" value="{L_PREVIEW}">&nbsp;<input type="submit" name="submit" value="{L_SUBMIT}">&nbsp;<input type="submit" name="cancel" value="{L_CANCEL}"></td>
 			</tr>
 		</table></td>
 	</form></tr>