diff --git a/SourceSVN/SourceSVN.php b/SourceSVN/SourceSVN.php
index cf6bd57..e31a0fd 100644
--- a/SourceSVN/SourceSVN.php
+++ b/SourceSVN/SourceSVN.php
@@ -19,7 +19,6 @@
 	public function register() {
 		$this->name = lang_get( 'plugin_SourceSVN_title' );
 		$this->description = lang_get( 'plugin_SourceSVN_description' );
-		$this->page = 'config_page';
 
 		$this->version = '0.14';
 		$this->requires = array(
@@ -46,6 +45,8 @@
 
 	public $type = 'svn';
 
+	public $configuration = true;
+
 	public function show_type() {
 		return lang_get( 'plugin_SourceSVN_svn' );
 	}
@@ -119,6 +120,50 @@
 		return $p_repo;
 	}
 
+	private static $config_form_handled = false;
+
+	public function update_config_form() {
+		# Prevent more than one SVN class from outputting form elements.
+		if ( !SourceSVNPlugin::$config_form_handled ) {
+			SourceSVNPlugin::$config_form_handled = true;
+
+			$t_svnpath = config_get( 'plugin_SourceSVN_svnpath', '' );
+
+?>
+<tr <?php echo helper_alternate_class() ?>>
+<td class="category"><?php echo lang_get( 'plugin_SourceSVN_svnpath' ) ?></td>
+<td><input name="plugin_SourceSVN_svnpath" value="<?php echo string_attribute( $t_svnpath ) ?>" size="40"/></td>
+</tr>
+<?php
+		}
+	}
+
+	public function update_config() {
+		# Prevent more than one SVN class from handling form elements.
+		if ( !SourceSVNPlugin::$config_form_handled ) {
+			SourceSVNPlugin::$config_form_handled = true;
+
+			$f_svnpath = gpc_get_string( 'plugin_SourceSVN_svnpath', '' );
+			$t_svnpath = config_get( 'plugin_SourceSVN_svnpath', '' );
+
+			$f_svnpath = rtrim( $f_svnpath, '/' );
+
+			if ( $f_svnpath != $t_svnpath ) {
+				if ( is_blank( $f_svnpath ) ) {
+					config_delete( 'plugin_SourceSVN_svnpath' );
+
+				} else {
+					# be sure that the path is valid
+					if ( ( $t_binary = SourceSVNPlugin::svn_binary( $f_svnpath, true ) ) != 'svn' ) {
+						config_set( 'plugin_SourceSVN_svnpath', $f_svnpath );
+					} else {
+						plugin_error( 'SVNPathInvalid', ERROR );
+					}
+				}
+			}
+		}
+	}
+
 	public function commit( $p_repo, $p_data ) {
 		if ( preg_match( '/(\d+)/', $p_data, $p_matches ) ) {
 			$svn = $this->svn_call( $p_repo );
@@ -218,7 +263,7 @@
 
 		if ( is_null( $s_binary ) || $p_reset ) {
 			if ( is_null( $p_path ) ) {
-				$t_path = config_get( 'plugin_SourceSVN_svnpath' );
+				$t_path = config_get( 'plugin_SourceSVN_svnpath', '' );
 			} else {
 				$t_path = $p_path;
 			}
@@ -237,10 +282,10 @@
 					return $s_binary = $t_binary;
 				}
 
-			} else {
-				# Generic pathless call
-				return $s_binary = 'svn';
 			}
+
+			# Generic pathless call
+			$s_binary = 'svn';
 		}
 
 		return $s_binary;
diff --git a/SourceSVN/pages/config_page.php b/SourceSVN/pages/config_page.php
deleted file mode 100644
index cf3261b..0000000
--- a/SourceSVN/pages/config_page.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-# Copyright (C) 2008-2010 John Reese, LeetCode.net
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-
-access_ensure_global_level( config_get( 'manage_plugin_threshold' ) );
-auth_reauthenticate();
-
-html_page_top();
-print_manage_menu();
-
-?>
-
-<br/>
-<form action="<?php echo plugin_page( 'config_update' ) ?>" method="post">
-<?php echo form_security_field( 'plugin_SourceSVN_config_update' ) ?>
-<table class="width75" align="center" cellspacing="1">
-
-<tr>
-<td class="form-title" colspan="2"><?php echo plugin_lang_get( 'title' ), ': ', plugin_lang_get( 'configuration' ) ?></td>
-</tr>
-
-<tr <?php echo helper_alternate_class() ?>>
-<td class="category"><?php echo plugin_lang_get( 'svnpath' ) ?></td>
-<td><input name="svnpath" value="<?php echo string_attribute( plugin_config_get( 'svnpath' ) ) ?>" size="40"/></td>
-</tr>
-
-<tr>
-<td class="center" colspan="2"><input type="submit" value="<?php echo plugin_lang_get( 'update' ) ?>"/></td>
-</tr>
-
-</table>
-</form>
-
-<?php
-html_page_bottom( __FILE__ );
-
diff --git a/SourceSVN/pages/config_update.php b/SourceSVN/pages/config_update.php
deleted file mode 100644
index 2f3f18a..0000000
--- a/SourceSVN/pages/config_update.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-# Copyright (C) 2008-2010 John Reese, LeetCode.net
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-
-form_security_validate( 'plugin_SourceSVN_config_update' );
-
-access_ensure_global_level( config_get( 'manage_plugin_threshold' ) );
-auth_reauthenticate();
-
-$f_svnpath = gpc_get_string( 'svnpath', '' );
-$t_svnpath = plugin_config_get( 'svnpath' );
-
-$f_svnpath = rtrim( $f_svnpath, '/' );
-
-if ( $f_svnpath != $t_svnpath ) {
-	if ( is_blank( $f_svnpath ) ) {
-		plugin_config_delete( 'svnpath' );
-
-	} else {
-		# be sure that the path is valid
-		if ( SourceSVNPlugin::svn_binary( $f_svnpath, true ) != 'svn' ) {
-			plugin_config_set( 'svnpath', $f_svnpath );
-		} else {
-			plugin_error( 'SVNPathInvalid' );
-		}
-	}
-}
-
-form_security_purge( 'plugin_SourceSVN_config_update' );
-print_successful_redirect( plugin_page( 'config_page', true ) );
-