diff --git a/Source/Source.php b/Source/Source.php
index c1a3346..f8edcbf 100644
--- a/Source/Source.php
+++ b/Source/Source.php
@@ -44,13 +44,13 @@
 			'manage_threshold'	=> ADMINISTRATOR,
 
 			'enable_porting'	=> OFF,
+			'enable_resolving'	=> OFF,
 
 			'buglink_regex_1'	=> '/(?:bugs?|issues?|reports?)+\s+(?:#?(?:\d+)[,\.\s]*)+/i',
 			'buglink_regex_2'	=> '/#?(\d+)/',
 
-			'bugfix_resolving'	=> OFF,
 			'bugfix_resolution'	=> FIXED,
-			'bugfix_regex_1'	=> '/(?:fixe?s?|resolves?)+\s+(?:bugs?|issues?|reports?)+\s+(?:#?(?:\d+)[,\.\s]*)+/i',
+			'bugfix_regex_1'	=> '/(?:fixe?s?|resolves?)+\s+(?:#?(?:\d+)[,\.\s]*)+/i',
 			'bugfix_regex_2'	=> '/#?(\d+)/',
 
 			'remote_checkin'	=> OFF,
@@ -175,7 +175,7 @@
 			array( 'AddColumnSQL', array( plugin_table( 'changeset' ), "
 				author_email	C(250)	NOTNULL DEFAULT \" '' \"
 				" ) ),
-			# 2009-03-03 - Add committer information properties to changesets
+			# 2009-04-03 - Add committer information properties to changesets
 			array( 'AddColumnSQL', array( plugin_table( 'changeset' ), "
 				committer		C(250)	NOTNULL DEFAULT \" '' \",
 				committer_email	C(250)	NOTNULL DEFAULT \" '' \",
diff --git a/Source/lang/strings_english.txt b/Source/lang/strings_english.txt
index 9f1dff7..22114f5 100644
--- a/Source/lang/strings_english.txt
+++ b/Source/lang/strings_english.txt
@@ -80,15 +80,15 @@
 $s_plugin_Source_manage_threshold = 'Manage Threshold';
 $s_plugin_Source_buglink_regex_1 = 'Bug Link PCRE Pass 1';
 $s_plugin_Source_buglink_regex_2 = 'Bug Link PCRE Pass 2';
-$s_plugin_Source_bugfix_resolving = 'Allow Resolving Issues';
-$s_plugin_Source_bugfix_resolution = 'Bug Resolution';
-$s_plugin_Source_bugfix_regex_1 = 'Bug Resolve PCRE Pass 1';
-$s_plugin_Source_bugfix_regex_2 = 'Bug Resolve PCRE Pass 2';
+$s_plugin_Source_bugfix_regex_1 = 'Bug Fixed PCRE Pass 1';
+$s_plugin_Source_bugfix_regex_2 = 'Bug Fixed PCRE Pass 2';
+$s_plugin_Source_bugfix_resolution = 'Bug Fixed Resolution';
 $s_plugin_Source_reset = 'Reset to default';
 $s_plugin_Source_menu_links = 'Main Menu Links';
 $s_plugin_Source_show_repo_link = 'Repositories';
 $s_plugin_Source_show_search_link = 'Search';
 $s_plugin_Source_enabled_features = 'Enabled Features';
+$s_plugin_Source_enable_resolving = 'Resolve Fixed Issues';
 $s_plugin_Source_enable_porting = 'Porting Status';
 
 $s_plugin_Source_changeset_attached = 'Changeset attached';
diff --git a/Source/pages/manage_config.php b/Source/pages/manage_config.php
index 2c660a8..8b6cd52 100644
--- a/Source/pages/manage_config.php
+++ b/Source/pages/manage_config.php
@@ -22,6 +22,7 @@
 $f_show_repo_link = gpc_get_bool( 'show_repo_link', OFF );
 $f_show_search_link = gpc_get_bool( 'show_search_link', OFF );
 
+$f_enable_resolving = gpc_get_bool( 'enable_resolving', OFF );
 $f_enable_porting = gpc_get_bool( 'enable_porting', OFF );
 
 $f_buglink_regex_1 = gpc_get_string( 'buglink_regex_1' );
@@ -29,7 +30,6 @@
 $f_buglink_regex_2 = gpc_get_string( 'buglink_regex_2' );
 $f_buglink_reset_2 = gpc_get_string( 'buglink_reset_2', OFF );
 
-$f_bugfix_resolving = gpc_get_bool( 'bugfix_resolving', OFF );
 $f_bugfix_resolution = gpc_get_int( 'bugfix_resolution' );
 $f_bugfix_regex_1 = gpc_get_string( 'bugfix_regex_1' );
 $f_bugfix_reset_1 = gpc_get_string( 'bugfix_reset_1', OFF );
@@ -74,6 +74,7 @@
 maybe_set_option( 'show_repo_link', $f_show_repo_link );
 maybe_set_option( 'show_search_link', $f_show_search_link );
 
+maybe_set_option( 'enable_resolving', $f_enable_resolving );
 maybe_set_option( 'enable_porting', $f_enable_porting );
 
 if ( ! $f_buglink_reset_1 ) {
@@ -88,9 +89,6 @@
 	plugin_config_delete( 'buglink_regex_2' );
 }
 
-maybe_set_option( 'bugfix_resolving', $f_bugfix_resolving );
-maybe_set_option( 'bugfix_resolution', $f_bugfix_resolution );
-
 if ( ! $f_bugfix_reset_1 ) {
 	maybe_set_option( 'bugfix_regex_1', $f_bugfix_regex_1 );
 } else {
@@ -103,6 +101,8 @@
 	plugin_config_delete( 'bugfix_regex_2' );
 }
 
+maybe_set_option( 'bugfix_resolution', $f_bugfix_resolution );
+
 maybe_set_option( 'remote_checkin', $f_remote_checkin );
 maybe_set_option( 'checkin_urls', serialize( $t_checkin_urls ) );
 maybe_set_option( 'remote_imports', $f_remote_imports );
diff --git a/Source/pages/manage_config_page.php b/Source/pages/manage_config_page.php
index 8ea3992..9aaa971 100644
--- a/Source/pages/manage_config_page.php
+++ b/Source/pages/manage_config_page.php
@@ -64,6 +64,8 @@
 <tr <?php echo helper_alternate_class() ?>>
 <td class="category"><?php echo plugin_lang_get( 'enabled_features' ) ?></td>
 <td>
+	<label><input type="checkbox" name="enable_resolving" <?php echo ( plugin_config_get( 'enable_resolving' ) ? 'checked="checked" ' : '' ) ?>/>
+	<?php echo plugin_lang_get( 'enable_resolving' ) ?></label><br/>
 	<label><input type="checkbox" name="enable_porting" <?php echo ( plugin_config_get( 'enable_porting' ) ? 'checked="checked" ' : '' ) ?>/>
 	<?php echo plugin_lang_get( 'enable_porting' ) ?></label><br/>
 </td>
@@ -90,16 +92,6 @@
 <tr><td class="spacer"></td></tr>
 
 <tr <?php echo helper_alternate_class() ?>>
-<td class="category"><?php echo plugin_lang_get( 'bugfix_resolving' ) ?></td>
-<td><input name="bugfix_resolving" type="checkbox" <?php echo (ON == plugin_config_get( 'bugfix_resolving' ) ? 'checked="checked"' : '') ?>></td>
-</tr>
-
-<tr <?php echo helper_alternate_class() ?>>
-<td class="category"><?php echo plugin_lang_get( 'bugfix_resolution' ) ?></td>
-<td><select name="bugfix_resolution"><?php print_enum_string_option_list( 'resolution', plugin_config_get( 'bugfix_resolution' ) ) ?></select></td>
-</tr>
-
-<tr <?php echo helper_alternate_class() ?>>
 <td class="category"><?php echo plugin_lang_get( 'bugfix_regex_1' ) ?></td>
 <td>
 	<input name="bugfix_regex_1" size="50" maxlength="500" value="<?php echo string_attribute( plugin_config_get( 'bugfix_regex_1' ) ) ?>"/>
@@ -115,6 +107,11 @@
 </td>
 </tr>
 
+<tr <?php echo helper_alternate_class() ?>>
+<td class="category"><?php echo plugin_lang_get( 'bugfix_resolution' ) ?></td>
+<td><select name="bugfix_resolution"><?php print_enum_string_option_list( 'resolution', plugin_config_get( 'bugfix_resolution' ) ) ?></select></td>
+</tr>
+
 <tr><td class="spacer"></td></tr>
 
 <tr <?php echo helper_alternate_class() ?>>