diff --git a/e107_plugins/forum/forum_post.php b/e107_plugins/forum/forum_post.php
index a7121b121..48c53080c 100644
--- a/e107_plugins/forum/forum_post.php
+++ b/e107_plugins/forum/forum_post.php
@@ -1220,7 +1220,7 @@ class forum_post_handler
 				case 'nt':
 
 					$threadInfo['thread_sticky']    = (MODERATOR ? (int)$_POST['threadtype'] : 0);
-					$threadInfo['thread_name']      = $_POST['subject'];
+					$threadInfo['thread_name']      = e107::getParser()->toDB($_POST['subject']);
 					$threadInfo['thread_forum_id']  = $this->id;
 					$threadInfo['thread_active']    = 1;
 					$threadInfo['thread_datestamp'] = $time;
@@ -1248,8 +1248,6 @@ class forum_post_handler
 					//	$this->data['thread_sef'] = $postResult['threadsef'];
 						$this->data['thread_sef'] = eHelper::title2sef($threadInfo['thread_name'],'dashl');
 
-
-
 						if($_POST['email_notify'])
 						{
 							$this->forumObj->track('add', USERID, $newThreadId);
diff --git a/e107_plugins/forum/shortcodes/batch/post_shortcodes.php b/e107_plugins/forum/shortcodes/batch/post_shortcodes.php
index eac2ea316..0aa0daa12 100644
--- a/e107_plugins/forum/shortcodes/batch/post_shortcodes.php
+++ b/e107_plugins/forum/shortcodes/batch/post_shortcodes.php
@@ -504,7 +504,7 @@ class plugin_forum_post_shortcodes extends e_shortcode
 					$chk = ($pref['notify_on'] ? "checked='checked'" : '');
 				}
 			}
-			return "<br /><input type='checkbox' name='notify' value='1' {$chk} />&nbsp;<span class='defaulttext'>".LAN_FORUM_3040."</span>";
+			return "<br /><input type='checkbox' name='email_notify' value='1' {$chk} />&nbsp;<span class='defaulttext'>".LAN_FORUM_3040."</span>";
 		}
 
 		return '';