diff --git a/actions/avatar.php b/actions/avatar.php
index 851ef23f4a..8a4557f382 100644
--- a/actions/avatar.php
+++ b/actions/avatar.php
@@ -19,6 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
+require_once(INSTALLDIR.'/lib/settingsaction.php');
+
 class AvatarAction extends SettingsAction {
 
 	function show_form($msg=NULL, $success=false) {
diff --git a/actions/password.php b/actions/password.php
index c9869f1778..c5ab28ee97 100644
--- a/actions/password.php
+++ b/actions/password.php
@@ -19,6 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
+require_once(INSTALLDIR.'/lib/settingsaction.php');
+
 class PasswordAction extends SettingsAction {
 	
 	function show_form($msg=NULL, $success=false) {
diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index ae060dd908..7779379b12 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -19,6 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
+require_once(INSTALLDIR.'/lib/settingsaction.php');
+
 class ProfilesettingsAction extends SettingsAction {
 	
 	function show_form($msg=NULL, $success=false) {
diff --git a/actions/register.php b/actions/register.php
index 2b41b6a77a..a6cdbb51b9 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -52,7 +52,7 @@ class RegisterAction extends Action {
 			$this->show_form(_t('Passwords don\'t match.'));
 		} else if ($this->register_user($nickname, $password, $email)) {
 			common_set_user($nickname);
-			common_redirect(common_local_url('settings'));
+			common_redirect(common_local_url('profilesettings'));
 		} else {
 			$this->show_form(_t('Invalid username or password.'));
 		}
diff --git a/doc/TODO b/doc/TODO
index c02832ca90..281f5b1dfd 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -49,6 +49,7 @@
 - site logo
 - theme per site
 - theme per profile
+- email confirmation for registration
 - release 0.2
 - content negotiation for interface language
 - content negotiation for content type