diff --git a/html/forum/post.php b/html/forum/post.php
index c6e5698ddd..be5c4db1e1 100644
--- a/html/forum/post.php
+++ b/html/forum/post.php
@@ -10,7 +10,10 @@ if (!empty($_GET['id']) && !empty($_POST['title']) && !empty($_POST['content']))
 
 	$user = get_logged_in_user(true, '../');
 
-	$threadID = createThread($_GET['id'], $user->id, $_POST['title'], $_POST['content']);
+    if ($_POST['add_signature']=="add_it"){
+        $forum_signature = "\n".$user->signature;
+    }
+    $threadID = createThread($_GET['id'], $user->id, $_POST['title'], $_POST['content'].$forum_signature);
 
 	header('Location: thread.php?id=' . $threadID);
 }
@@ -37,7 +40,17 @@ if ($category->is_helpdesk) {
 show_forum_title($forum, NULL, $category->is_helpdesk);
 
 if ($category->is_helpdesk) {
-	echo "<p>The ", PROJECT, " Help Desk is designed to help users find answers to questions they might have about our project, software, science, etc.<p>To ensure that this is effectively achieved, please make sure to skim the questions that have already been posted before posting your own.  If your question has already been asked by another user, clicking on the \"I also have this problem\" button in their post will be more effective than re-posting the question.</p><p>If you've been unable to find your question already posted, please fill in the fields below to add it to the Help Desk.</p></p>";
+	echo "<p>The ", PROJECT, " Help Desk is designed to help users
+        find answers to questions they might have about our project,
+        software, science, etc.<p>To ensure that this is effectively
+        achieved, please make sure to skim the questions that
+        have already been posted before posting your own.
+        If your question has already been asked by another user,
+        clicking on the \"I also have this problem\" button
+        in their post will be more effective than re-posting the question.
+        <p>If you've been unable to find your question already posted,
+        please fill in the fields below to add it to the Help Desk.</p>
+    ";
 }
 
 echo "<form action=\"post.php?id=", $_GET['id'], "\" method=\"POST\">";
@@ -56,25 +69,34 @@ if ($category->is_helpdesk) {
 }
 
 echo "
-				</td>
-				<td><input type=\"text\" name=\"title\" size=62></td>
-			</tr>
-			<tr>
-				<td class=fieldname style=\"vertical-align:top\"><b>Message content</b>
+    </td>
+    <td><input type=\"text\" name=\"title\" size=62></td>
+    </tr>
+    <tr>
+    <td class=fieldname style=\"vertical-align:top\"><b>Message content</b>
 ";
 
 if ($category->is_helpdesk) {
-	echo "<p>Please be as specific as possible: if you are having software problems for example, be sure to mention the version of the software you are running, your computer type, operating system, etc.</p><p>The more detailed your description, the more likely someone will be able to post an answer that solves your problem.</p></td>";
+	echo "<p>Please be as specific as possible:
+        if you are having software problems for example,
+        be sure to mention the version of the software you are running,
+        your computer type, operating system, etc.
+        <p>The more detailed your description,
+        the more likely someone will be able to post an answer
+        that solves your problem.</td>
+    ";
 }
 
 echo "
-				<td><textarea name=\"content\" rows=\"12\" cols=\"54\"></textarea></td>
-			</tr>
-			<tr>
-				<td colspan=2 style=\"text-align:center\">
-					<input type=\"submit\" value=\"Post message\">
-				</td>
-			</tr>
+    <td><textarea name=\"content\" rows=\"12\" cols=\"54\"></textarea></td>
+    </tr>
+    <tr>
+    <td colspan=2 style=\"text-align:center\">
+     <input name=add_signature value=add_it checked=true type=checkbox>Add my signature to this post
+                        &nbsp;&nbsp;&nbsp;
+    <input type=\"submit\" value=\"Post message\">
+    </td>
+    </tr>
 ";
 
 end_forum_table();
@@ -82,4 +104,4 @@ end_forum_table();
 echo "</form>\n";
 
 page_tail();
-?>
\ No newline at end of file
+?>
diff --git a/html/forum/reply.php b/html/forum/reply.php
index ffd786c4cf..b835ec5709 100644
--- a/html/forum/reply.php
+++ b/html/forum/reply.php
@@ -16,7 +16,10 @@ if (!empty($_GET['thread']) && !empty($_POST['content'])) {
 
 	$user = get_logged_in_user(true, '../');
 
-	replyToThread($_GET['thread'], $user->id, $_POST['content'], $parent_post);
+    if ($_POST['add_signature']=="add_it"){
+        $forum_signature = "\n".$user->signature;
+    }  
+	replyToThread($_GET['thread'], $user->id, $_POST['content'].$forum_signature, $parent_post);
 	notify_subscribers($_GET['thread']);
 
 	header('Location: thread.php?id='.$_GET['thread']);
@@ -102,6 +105,9 @@ Joined: ", date('M j, Y', $logged_in_user->create_time), "
     if ($post) echo quote_text(stripslashes($post->content), 80);
     echo "</textarea><p>
 	    <input type=\"submit\" value=\"Post reply\"></p>
+        &nbsp;&nbsp;&nbsp;
+        <input name=add_signature value=add_it checked=true type=checkbox>Add my signature to this reply                                
+
 	</form>
 	";
 
@@ -136,4 +142,4 @@ function quote_text($text, $cols) {
 
     return $final;
 }
-?>
\ No newline at end of file
+?>