diff --git a/Source/Source.API.php b/Source/Source.API.php
index f3cf00c..660a3a7 100644
--- a/Source/Source.API.php
+++ b/Source/Source.API.php
@@ -65,8 +65,8 @@
 	$t_bugs = array();
 
 	if ( is_null( $s_regex1 ) ) {
-		$s_regex1 = plugin_config_get( 'buglink_regex_1', null, 'Source' );
-		$s_regex2 = plugin_config_get( 'buglink_regex_2', null, 'Source' );
+		$s_regex1 = config_get( 'plugin_Source_buglink_regex_1' );
+		$s_regex2 = config_get( 'plugin_Source_buglink_regex_2' );
 	}
 
 	preg_match_all( $s_regex1, $p_string, $t_matches_all );
@@ -95,8 +95,8 @@
 	$t_bugs = array();
 
 	if ( is_null( $s_regex1 ) ) {
-		$s_regex1 = plugin_config_get( 'bugfix_regex_1', null, 'Source' );
-		$s_regex2 = plugin_config_get( 'bugfix_regex_2', null, 'Source' );
+		$s_regex1 = config_get( 'plugin_Source_bugfix_regex_1' );
+		$s_regex2 = config_get( 'plugin_Source_bugfix_regex_2' );
 	}
 
 	preg_match_all( $s_regex1, $p_string, $t_matches_all );
@@ -129,7 +129,7 @@
 	}
 
 	# Parse resolved bug links
-	if ( plugin_config_get( 'bugfix_resolving', null, 'Source' ) ) {
+	if ( config_get( 'plugin_Source_bugfix_resolving' ) ) {
 		$t_resolved_bugs = array();
 
 		# Find and associate resolve links with the changeset
diff --git a/Source/pages/manage_config.php b/Source/pages/manage_config.php
index 7c6d559..e7fbceb 100644
--- a/Source/pages/manage_config.php
+++ b/Source/pages/manage_config.php
@@ -29,7 +29,7 @@
 $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' );
+$f_bugfix_resolving = gpc_get_bool( 'bugfix_resolving', OFF );
 $f_bugfix_regex_1 = gpc_get_string( 'bugfix_regex_1' );
 $f_bugfix_reset_1 = gpc_get_string( 'bugfix_reset_1', OFF );
 $f_bugfix_regex_2 = gpc_get_string( 'bugfix_regex_2' );