diff --git a/config_inc.php b/config_inc.php
index 846408234e..86f86f039d 100644
--- a/config_inc.php
+++ b/config_inc.php
@@ -44,7 +44,7 @@
 	#--------------------
 	# enter the exact url where the bugtracker is located
 	# used in the emailing system
-	$g_login_url            = "http://www.mydomain.com/mantis/";
+	$g_mantis_url            = "http://www.mydomain.com/mantis/";
 	#--------------------
 
 	#--------------------
@@ -164,11 +164,28 @@
 	$g_view_assigned_cookie           = $g_cookie_prefix."_VIEW_ASSIGNED_COOKIE";
 
 	# cookie values
-	$g_string_cookie_val              = $HTTP_COOKIE_VARS[$g_string_cookie];
-	$g_project_cookie_val             = $HTTP_COOKIE_VARS[$g_project_cookie];
-	$g_view_all_cookie_val            = $HTTP_COOKIE_VARS[$g_view_all_cookie];
-	$g_view_reported_cookie_val       = $HTTP_COOKIE_VARS[$g_view_reported_cookie];
-	$g_view_assigned_cookie_val       = $HTTP_COOKIE_VARS[$g_view_assigned_cookie];
+
+	$g_string_cookie_val              = "";
+	$g_project_cookie_val             = "";
+	$g_view_all_cookie_val            = "";
+	$g_view_reported_cookie_val       = "";
+	$g_view_assigned_cookie_val       = "";
+
+	if ( isset( $g_string_cookie ) ) {
+		$g_string_cookie_val              = $HTTP_COOKIE_VARS[$g_string_cookie];
+	}
+	if ( isset( $g_project_cookie ) ) {
+		$g_project_cookie_val             = $HTTP_COOKIE_VARS[$g_project_cookie];
+	}
+	if ( isset( $g_view_all_cookie ) ) {
+		$g_view_all_cookie_val            = $HTTP_COOKIE_VARS[$g_view_all_cookie];
+	}
+	if ( isset( $g_view_reported_cookie ) ) {
+		$g_view_reported_cookie_val       = $HTTP_COOKIE_VARS[$g_view_reported_cookie];
+	}
+	if ( isset( $g_view_assigned_cookie ) ) {
+		$g_view_assigned_cookie_val       = $HTTP_COOKIE_VARS[$g_view_assigned_cookie];
+	}
 	#--------------------
 
 	#--------------------
@@ -239,6 +256,9 @@
 	$g_bugnote_add                    = "bugnote_add".$g_php;
 	$g_bugnote_delete                 = "bugnote_delete".$g_php;
 
+	# documentation
+	$g_documentation_html             = "documentation.html";
+
 	# report bug
 	$g_report_bug_page                = "report_bug_page".$g_php;
 	$g_report_bug_advanced_page       = "report_bug_advanced_page".$g_php;
@@ -349,4 +369,4 @@
 	#version
 	$g_mantis_version = "0.14.3";
 	#--------------------
-?>
+?>
\ No newline at end of file
diff --git a/documentation.html b/documentation.html
index dd74c32ec2..af091377ee 100644
--- a/documentation.html
+++ b/documentation.html
@@ -58,6 +58,15 @@ <h2>Part 1: Index</h2>
 	<ul>
 	<li><a href="#report_bug_simple">Report Bug Simple</a>
 	<li><a href="#report_bug_advanced">Report Bug Advanced</a>
+		<ul>
+			<li><a href="#category">Category</a>
+			<li><a href="#reproducibility">Reproducibility</a>
+			<li><a href="#severity">Severity</a>
+			<li><a href="#summary">Summary</a>
+			<li><a href="#description">Description</a>
+			<li><a href="#steps_to_reproduce">Steps to Reproduce</a>
+			<li><a href="#additional_information">Additional Information</a>
+		</ul>
 	</ul>
 <li><a href="#summary">Summary</a>
 <li><a href="#account">Account</a>
@@ -302,6 +311,56 @@ <h4><a name=report_bug_simple>[ Report Bug Simple ]</a></h4>
 <p>
 Summary should be a short, one sentence description of the problem.  It has a limit of 128 characters.
 <p>
+<blockquote>
+<h5><a name=category>[ Category ]</a></h5>
+<p>
+Select the most apprpriate category for the report.  These categories are defined per project by the project administrator
+<p>
+<h5><a name=reproducibility>[ Reproducibility ]</a></h5>
+<p>
+Reproducibilty is the key to being able to quickly fix a bug.
+<ul>
+	<li>always
+	<li>sometimes
+	<li>random
+	<li>have not tried
+	<li>unable to duplicate
+</ul>
+<p>
+<h5><a name=severity>[ Severity ]</a></h5>
+<p>
+<ul>
+	<li>block - prevents further work/progress from being made
+	<li>crash - crashes the application or OS
+	<li>major - major bug
+	<li>minor - minor bug
+	<li>tweak - needs tweaking
+	<li>text - error in the text
+	<li>trivial - being nitpicky
+	<li>feature - requesting new feature
+</ul>
+<p>
+<h5><a name=summary>[ Summary ]</a></h5>
+<p>
+A brief one line description of the problem
+<p>
+<h5><a name=description>[ Description ]</a></h5>
+<p>
+A detailed description of the problem
+<p>
+<h5><a name=steps_to_reproduce>[ Steps to Reproduce ]</a></h5>
+<p>
+List the detailed steps to reproduce a problem.  This is useful for bugs that take a while to show up or tricky cases.  It would be best to use a format that looks like
+<p>
+1. step 1<br>
+2. step 2<br>
+3. step 3
+<p>
+<h5><a name=additional_information>[ Additional Information ]</a></h5>
+<p>
+Anything extra information that you didn't put into the Description should go here.
+<p>
+</blockquote>
 
 <p>
 <h4><a name=report_bug_advanced>[ Report Bug Advanced ]</a></h4>
diff --git a/report_add.php3 b/report_add.php3
index 4372ea90f4..b7d513c75b 100644
--- a/report_add.php3
+++ b/report_add.php3
@@ -8,7 +8,8 @@
 <? login_cookie_check() ?>
 <?
 	db_connect( $g_hostname, $g_db_username, $g_db_password, $g_database_name );
-
+?>
+<?
 	if ( !access_level_check_greater_or_equal( "viewer" ) ) {
 		# should be an access error page
 		header( "Location: $g_logout_page" );
@@ -140,7 +141,28 @@
 			PRINT "$s_must_enter_description<br>";
 		}
 		PRINT "<p>";
-		PRINT "$s_hit_back_msg";
+
+?>
+		<form method=post action="<? echo $HTTP_REFERER ?>">
+		<input type=hidden name=f_category value="<? echo $f_category ?>">
+		<input type=hidden name=f_severity value="<? echo $f_severity ?>">
+		<input type=hidden name=f_reproducibility value="<? echo $f_reproducibility ?>">
+
+		<input type=hidden name=f_profile_id value="<? echo $f_profile_id ?>">
+		<input type=hidden name=f_platform value="<? echo $f_platform ?>">
+		<input type=hidden name=f_os value="<? echo $f_os ?>">
+		<input type=hidden name=f_osbuild value="<? echo $f_osbuild ?>">
+		<input type=hidden name=f_product_version value="<? echo $f_product_version ?>">
+		<input type=hidden name=f_build value="<? echo $f_build ?>">
+		<input type=hidden name=f_assign_id value="<? echo $f_assign_id ?>">
+
+		<input type=hidden name=f_summary value="<? echo $f_summary ?>">
+		<input type=hidden name=f_description value="<? echo $f_description ?>">
+		<input type=hidden name=f_steps_to_reproduce value="<? echo $f_steps_to_reproduce ?>">
+		<input type=hidden name=f_additional_info value="<? echo $f_additional_info ?>">
+		<input type=submit value="<? echo $s_go_back ?>">
+		</form>
+<?
 	}
 	### MYSQL ERROR
 	else if ( !$result ) {
diff --git a/report_bug_advanced_page.php3 b/report_bug_advanced_page.php3
index 151604ca6e..cfd46ef037 100644
--- a/report_bug_advanced_page.php3
+++ b/report_bug_advanced_page.php3
@@ -40,37 +40,37 @@
 	</tr>
 	<tr bgcolor=<? echo $g_primary_color_dark ?>>
 		<td valign=top width=25%>
-			<? echo $s_category ?>:<br>
-			<span class="required">[*<? echo $s_required ?>*]</span>
+			<? echo $s_category ?> <? print_documentaion_link( "category" ) ?>:<br>
+			<span class="required">*<? echo $s_required ?>*</span>
 		</td>
 		<td>
 			<select name=f_category>
 				<option value="" selected><? echo $s_select_category ?>
-				<? print_category_option_list() ?>
+				<? print_category_option_list( $f_category ) ?>
 			</select>
 		</td>
 	</tr>
 	<tr bgcolor=<? echo $g_primary_color_light ?>>
 		<td>
-			<? echo $s_reproducibility ?>:<br>
-			<span class="required">[*<? echo $s_required ?>*]</span>
+			<? echo $s_reproducibility ?> <? print_documentaion_link( "reproducibility" ) ?>:<br>
+			<span class="required">*<? echo $s_required ?>*</span>
 		</td>
 		<td>
 			<select name=f_reproducibility>
 				<option value="" selected><? echo $s_select_reproducibility ?>
-				<? print_field_option_list( "reproducibility" ) ?>
+				<? print_field_option_list( "reproducibility", $f_reproducibility ) ?>
 			</select>
 		</td>
 	</tr>
 	<tr bgcolor=<? echo $g_primary_color_dark ?>>
 		<td>
-			<? echo $s_severity ?>:<br>
-			<span class="required">[*<? echo $s_required ?>*]</span>
+			<? echo $s_severity ?> <? print_documentaion_link( "severity" ) ?>:<br>
+			<span class="required">*<? echo $s_required ?>*</span>
 		</td>
 		<td>
 			<select name=f_severity>
 				<option value="" selected><? echo $s_select_severity ?>
-				<? print_field_option_list( "severity" ) ?>
+				<? print_field_option_list( "severity", $f_severity ) ?>
 			</select>
 		</td>
 	</tr>
@@ -84,7 +84,7 @@
 		</td>
 		<td>
 			<select name=f_profile_id>
-				<? print_profile_option_list( get_current_user_field( "id " ) ) ?>
+				<? print_profile_option_list( get_current_user_field( "id " ), $f_profile_id ) ?>
 			</select>
 		</td>
 	</tr>
@@ -98,7 +98,7 @@
 			<? echo $s_platform ?>:
 		</td>
 		<td>
-			<input type=text name=f_platform size=32 maxlength=32>
+			<input type=text name=f_platform size=32 maxlength=32 value="<? echo $f_platform ?>">
 		</td>
 	</tr>
 	<tr bgcolor=<? echo $g_primary_color_dark ?>>
@@ -106,7 +106,7 @@
 			<? echo $s_os ?>:
 		</td>
 		<td>
-			<input type=text name=f_os size=32 maxlength=32>
+			<input type=text name=f_os size=32 maxlength=32 value="<? echo $f_os ?>">
 		</td>
 	</tr>
 	<tr bgcolor=<? echo $g_primary_color_light ?>>
@@ -114,7 +114,7 @@
 			<? echo $s_os_version ?>:
 		</td>
 		<td>
-			<input type=text name=f_osbuild size=16 maxlength=16>
+			<input type=text name=f_osbuild size=16 maxlength=16 value="<? echo $f_osbuild ?>">
 		</td>
 	</tr>
 	<tr height=10 bgcolor=<? echo $g_white_color ?>>
@@ -127,7 +127,7 @@
 		</td>
 		<td>
 			<select name=f_product_version>
-				<? print_version_option_list() ?>
+				<? print_version_option_list( $f_product_version ) ?>
 			</select>
 		</td>
 	</tr>
@@ -136,7 +136,7 @@
 			<? echo $s_product_build ?>
 		</td>
 		<td>
-			<input type=text name=f_build size=4 maxlength=4>
+			<input type=text name=f_build size=4 maxlength=4 value="<? echo $f_build ?>">
 		</td>
 	</tr>
 	<tr height=10 bgcolor=<? echo $g_white_color ?>>
@@ -150,7 +150,7 @@
 		<td>
 			<select name=f_assign_id>
 				<option value="0000000" SELECTED>
-				<? print_assign_to_option_list() ?>
+				<? print_assign_to_option_list( $f_assign_id ) ?>
 			</select>
 		</td>
 	</tr>
@@ -160,36 +160,36 @@
 	</tr>
 	<tr bgcolor=<? echo $g_primary_color_dark ?>>
 		<td>
-			<? echo $s_summary ?>:<br>
-			<span class="required">[*<? echo $s_required ?>*]</span>
+			<? echo $s_summary ?> <? print_documentaion_link( "summary" ) ?>:<br>
+			<span class="required">*<? echo $s_required ?>*</span>
 		</td>
 		<td>
-			<input type=text name=f_summary size=80 maxlength=128>
+			<input type=text name=f_summary size=80 maxlength=128 value="<? echo $f_summary ?>">
 		</td>
 	</tr>
 	<tr bgcolor=<? echo $g_primary_color_light ?>>
 		<td>
-			<? echo $s_description ?>:<br>
-			<span class="required">[*<? echo $s_required ?>*]</span>
+			<? echo $s_description ?> <? print_documentaion_link( "description" ) ?>:<br>
+			<span class="required">*<? echo $s_required ?>*</span>
 		</td>
 		<td>
-			<textarea name=f_description cols=60 rows=5></textarea>
+			<textarea name=f_description cols=60 rows=5><? echo $f_description ?></textarea>
 		</td>
 	</tr>
 	<tr bgcolor=<? echo $g_primary_color_dark ?>>
 		<td>
-			<? echo $s_steps_to_reproduce ?>:
+			<? echo $s_steps_to_reproduce ?> <? print_documentaion_link( "steps_to_reproduce" ) ?>:
 		</td>
 		<td>
-			<textarea name=f_steps_to_reproduce cols=60 rows=5></textarea>
+			<textarea name=f_steps_to_reproduce cols=60 rows=5><? echo $f_steps_to_reproduce ?></textarea>
 		</td>
 	</tr>
 	<tr bgcolor=<? echo $g_primary_color_light ?>>
 		<td>
-			<? echo $s_additional_information ?>:
+			<? echo $s_additional_information ?> <? print_documentaion_link( "additional_information" ) ?>:
 		</td>
 		<td>
-			<textarea name=f_additional_info cols=60 rows=5></textarea>
+			<textarea name=f_additional_info cols=60 rows=5><? echo $f_additional_info ?></textarea>
 		</td>
 	</tr>
 	<tr>
diff --git a/report_bug_page.php3 b/report_bug_page.php3
index d091bc1c60..f0ea11ec2e 100644
--- a/report_bug_page.php3
+++ b/report_bug_page.php3
@@ -47,64 +47,64 @@
 	</tr>
 	<tr bgcolor=<? echo $g_primary_color_dark ?>>
 		<td valign=top width=25%>
-			<? echo $s_category ?>:<br>
-			<span class="required">[*<? echo $s_required ?>*]</span>
+			<? echo $s_category ?> <? print_documentaion_link( "category" ) ?>:<br>
+			<span class="required">*<? echo $s_required ?>*</span>
 		</td>
 		<td>
 			<select name=f_category>
 				<option value="" selected><? echo $s_select_category ?>
-				<? print_category_option_list() ?>
+				<? print_category_option_list( $f_category ) ?>
 			</select>
 		</td>
 	</tr>
 	<tr bgcolor=<? echo $g_primary_color_light ?>>
 		<td>
-			<? echo $s_reproducibility ?>:<br>
-			<span class="required">[*<? echo $s_required ?>*]</span>
+			<? echo $s_reproducibility ?> <? print_documentaion_link( "reproducibility" ) ?>:<br>
+			<span class="required">*<? echo $s_required ?>*</span>
 		</td>
 		<td>
 			<select name=f_reproducibility>
 				<option value="" SELECTED><? echo $s_select_reproducibility ?>
-				<? print_field_option_list( "reproducibility" ) ?>
+				<? print_field_option_list( "reproducibility",  $f_reproducibility  ) ?>
 			</select>
 		</td>
 	</tr>
 	<tr bgcolor=<? echo $g_primary_color_dark ?>>
 		<td>
-			<? echo $s_severity ?>:<br>
-			<span class="required">[*<? echo $s_required ?>*]</span>
+			<? echo $s_severity ?> <? print_documentaion_link( "severity" ) ?>:<br>
+			<span class="required">*<? echo $s_required ?>*</span>
 		</td>
 		<td>
 			<select name=f_severity>
 				<option value="" selected><? echo $s_select_severity ?>
-				<? print_field_option_list( "severity" ) ?>
+				<? print_field_option_list( "severity", $f_severity ) ?>
 			</select>
 		</td>
 	</tr>
 	<tr bgcolor=<? echo $g_primary_color_light ?>>
 		<td>
-			<? echo $s_summary ?>:<br>
-			<span class="required">[*<? echo $s_required ?>*]</span>
+			<? echo $s_summary ?> <? print_documentaion_link( "summary" ) ?>:<br>
+			<span class="required">*<? echo $s_required ?>*</span>
 		</td>
 		<td>
-			<input type=text name=f_summary size=80 maxlength=128>
+			<input type=text name=f_summary size=80 maxlength=128 value="<? echo $f_summary ?>">
 		</td>
 	</tr>
 	<tr bgcolor=<? echo $g_primary_color_dark ?>>
 		<td>
-			<? echo $s_description ?>:<br>
-			<span class="required">[*<? echo $s_required ?>*]</span>
+			<? echo $s_description ?> <? print_documentaion_link( "description" ) ?>:<br>
+			<span class="required">*<? echo $s_required ?>*</span>
 		</td>
 		<td>
-			<textarea name=f_description cols=60 rows=5></textarea>
+			<textarea name=f_description cols=60 rows=5><? echo $f_description ?></textarea>
 		</td>
 	</tr>
 	<tr bgcolor=<? echo $g_primary_color_light ?>>
 		<td>
-			<? echo $s_additional_information ?>:
+			<? echo $s_additional_information ?> <? print_documentaion_link( "additional_information" ) ?>:
 		</td>
 		<td>
-			<textarea name=f_additional_info cols=60 rows=5></textarea>
+			<textarea name=f_additional_info cols=60 rows=5><? echo $f_additional_info ?></textarea>
 		</td>
 	</tr>
 	<tr>