diff --git a/actions/avatar.php b/actions/avatar.php
deleted file mode 100644
index 9f397e93c3..0000000000
--- a/actions/avatar.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
- *
- * 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.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-if (!defined('LACONICA')) { exit(1); }
-
-require_once(INSTALLDIR.'/lib/settingsaction.php');
-
-class AvatarAction extends SettingsAction {
-
-    function get_instructions() {
-		return _('Upload a new "avatar" (user image) here. You can\'t edit the picture after you upload it, so make sure it\'s more or less square. It must be under the site license, also. Use a picture that belongs to you and that you want to share.');
-	}
-
-	function show_form($msg=NULL, $success=false) {
-
-		$this->form_header(_('Avatar'), $msg, $success);
-
-		$user = common_current_user();
-		$profile = $user->getProfile();
-		$original = $profile->getOriginalAvatar();
-
-		if ($original) {
-			common_element('img', array('src' => $original->url,
-										'class' => 'avatar original',
-										'width' => $original->width,
-										'height' => $original->height,
-										'alt' => $user->nickname));
-		}
-
-		$avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
-
-		if ($avatar) {
-			common_element('img', array('src' => $avatar->url,
-										'class' => 'avatar profile',
-										'width' => AVATAR_PROFILE_SIZE,
-										'height' => AVATAR_PROFILE_SIZE,
-										'alt' => $user->nickname));
-		}
-
-		common_element_start('form', array('enctype' => 'multipart/form-data',
-										   'method' => 'POST',
-										   'id' => 'avatar',
-										   'action' =>
-										   common_local_url('avatar')));
-		common_hidden('token', common_session_token());
-		common_element('input', array('name' => 'MAX_FILE_SIZE',
-									  'type' => 'hidden',
-									  'id' => 'MAX_FILE_SIZE',
-									  'value' => MAX_AVATAR_SIZE));
-		common_element('input', array('name' => 'avatarfile',
-									  'type' => 'file',
-									  'id' => 'avatarfile'));
-		common_submit('submit', _('Upload'));
-		common_element_end('form');
-		common_show_footer();
-	}
-
-	function handle_post() {
-
-		# CSRF protection
-
-		$token = $this->trimmed('token');
-		if (!$token || $token != common_session_token()) {
-			$this->show_form(_('There was a problem with your session token. Try again, please.'));
-			return;
-		}
-
-		switch ($_FILES['avatarfile']['error']) {
-		 case UPLOAD_ERR_OK: # success, jump out
-			break;
-		 case UPLOAD_ERR_INI_SIZE:
-		 case UPLOAD_ERR_FORM_SIZE:
-			$this->show_form(_('That file is too big.'));
-			return;
-		 case UPLOAD_ERR_PARTIAL:
-			@unlink($_FILES['avatarfile']['tmp_name']);
-			$this->show_form(_('Partial upload.'));
-			return;
-		 default:
-			$this->show_form(_('System error uploading file.'));
-			return;
-		}
-
-		$info = @getimagesize($_FILES['avatarfile']['tmp_name']);
-
-		if (!$info) {
-			@unlink($_FILES['avatarfile']['tmp_name']);
-			$this->show_form(_('Not an image or corrupt file.'));
-			return;
-		}
-
-		switch ($info[2]) {
-		 case IMAGETYPE_GIF:
-		 case IMAGETYPE_JPEG:
-		 case IMAGETYPE_PNG:
-			break;
-		 default:
-			$this->show_form(_('Unsupported image file format.'));
-			return;
-		}
-
-		$user = common_current_user();
-		$profile = $user->getProfile();
-
-		if ($profile->setOriginal($_FILES['avatarfile']['tmp_name'])) {
-			$this->show_form(_('Avatar updated.'), true);
-		} else {
-			$this->show_form(_('Failed updating avatar.'));
-		}
-
-		@unlink($_FILES['avatarfile']['tmp_name']);
-	}
-}
-
diff --git a/actions/password.php b/actions/password.php
deleted file mode 100644
index 23b95f7b68..0000000000
--- a/actions/password.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
- *
- * 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.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-if (!defined('LACONICA')) { exit(1); }
-
-require_once(INSTALLDIR.'/lib/settingsaction.php');
-
-class PasswordAction extends SettingsAction {
-
-	function get_instructions() {
-		return _('You can change your password here. Choose a good one!');
-	}
-
-	function show_form($msg=NULL, $success=false) {
-		$user = common_current_user();
-		$this->form_header(_('Change password'), $msg, $success);
-		$token = common_session_token();
-		common_element_start('form', array('method' => 'post',
-										   'id' => 'password',
-										   'action' =>
-										   common_local_url('password')));
-		common_hidden('token', $token);
-		# Users who logged in with OpenID won't have a pwd
-		if ($user->password) {
-			common_password('oldpassword', _('Old password'));
-		}
-		common_password('newpassword', _('New password'),
-						_('6 or more characters'));
-		common_password('confirm', _('Confirm'),
-						_('same as password above'));
-		common_submit('submit', _('Change'));
-		common_element_end('form');
-		common_show_footer();
-	}
-
-	function handle_post() {
-
-		$user = common_current_user();
-		assert(!is_null($user)); # should already be checked
-
-		# FIXME: scrub input
-
-		$newpassword = $this->arg('newpassword');
-		$confirm = $this->arg('confirm');
-		$token = $this->arg('token');
-		
-		if (!$token || $token != common_session_token()) {
-			$this->show_form(_('There was a problem with your session token. Try again, please.'));
-			return;
-		} else if (0 != strcmp($newpassword, $confirm)) {
-			$this->show_form(_('Passwords don\'t match.'));
-			return;
-		}
-
-		if ($user->password) {
-			$oldpassword = $this->arg('oldpassword');
-
-			if (!common_check_user($user->nickname, $oldpassword)) {
-				$this->show_form(_('Incorrect old password'));
-				return;
-			}
-		}
-
-		$original = clone($user);
-
-		$user->password = common_munge_password($newpassword, $user->id);
-
-		$val = $user->validate();
-		if ($val !== TRUE) {
-			$this->show_form(_('Error saving user; invalid.'));
-			return;
-		}
-
-		if (!$user->update($original)) {
-			common_server_error(_('Can\'t save new password.'));
-			return;
-		}
-
-		$this->show_form(_('Password saved.'), true);
-	}
-}
diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index f34101ba97..0474c69375 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -31,7 +31,10 @@ class ProfilesettingsAction extends SettingsAction {
 	function show_form($msg=NULL, $success=false) {
 		$this->form_header(_('Profile settings'), $msg, $success);
 		$this->show_settings_form();
+		common_element('h2', NULL, _('Avatar'));
 		$this->show_avatar_form();
+		common_element('h2', NULL, _('Change password'));
+		$this->show_password_form();
 		common_show_footer();
 	}
 
@@ -49,6 +52,8 @@ class ProfilesettingsAction extends SettingsAction {
 			$this->save_profile();
 		} else if ($this->arg('upload')) {
 			$this->upload_avatar();
+		} else if ($this->arg('changepass')) {
+			$this->change_password();
 		}
 	}
 
@@ -110,14 +115,11 @@ class ProfilesettingsAction extends SettingsAction {
 
 		common_element_start('form', array('enctype' => 'multipart/form-data',
 										   'method' => 'POST',
-										   'id' => 'profilesettings',
+										   'id' => 'avatar',
 										   'action' =>
 										   common_local_url('profilesettings')));
 		common_hidden('token', common_session_token());
 
-		common_element_start('p');
-		common_element('label', array('for' => 'avatar'), 'Avatar');
-
 		if ($original) {
 			common_element('img', array('src' => $original->url,
 										'class' => 'avatar original',
@@ -136,20 +138,47 @@ class ProfilesettingsAction extends SettingsAction {
 										'alt' => $user->nickname));
 		}
 
-		common_element_end('p');
 
 		common_element('input', array('name' => 'MAX_FILE_SIZE',
 									  'type' => 'hidden',
 									  'id' => 'MAX_FILE_SIZE',
 									  'value' => MAX_AVATAR_SIZE));
+
+		common_element_start('p');
+
+
 		common_element('input', array('name' => 'avatarfile',
 									  'type' => 'file',
 									  'id' => 'avatarfile'));
+		common_element_end('p');
+
 		common_submit('upload', _('Upload'));
 		common_element_end('form');
 
 	}
 
+	function show_password_form() {
+
+		$user = common_current_user();
+		common_element_start('form', array('method' => 'POST',
+										   'id' => 'password',
+										   'action' =>
+										   common_local_url('profilesettings')));
+
+		common_hidden('token', common_session_token());
+
+		# Users who logged in with OpenID won't have a pwd
+		if ($user->password) {
+			common_password('oldpassword', _('Old password'));
+		}
+		common_password('newpassword', _('New password'),
+						_('6 or more characters'));
+		common_password('confirm', _('Confirm'),
+						_('same as password above'));
+		common_submit('changepass', _('Change'));
+		common_element_end('form');
+	}
+
 	function save_profile() {
 		$nickname = $this->trimmed('nickname');
 		$fullname = $this->trimmed('fullname');
@@ -329,4 +358,48 @@ class ProfilesettingsAction extends SettingsAction {
 			return $other->id != $user->id;
 		}
 	}
+
+	function change_password() {
+
+		$user = common_current_user();
+		assert(!is_null($user)); # should already be checked
+
+		# FIXME: scrub input
+
+		$newpassword = $this->arg('newpassword');
+		$confirm = $this->arg('confirm');
+		$token = $this->arg('token');
+
+		if (0 != strcmp($newpassword, $confirm)) {
+			$this->show_form(_('Passwords don\'t match.'));
+			return;
+		}
+
+		if ($user->password) {
+			$oldpassword = $this->arg('oldpassword');
+
+			if (!common_check_user($user->nickname, $oldpassword)) {
+				$this->show_form(_('Incorrect old password'));
+				return;
+			}
+		}
+
+		$original = clone($user);
+
+		$user->password = common_munge_password($newpassword, $user->id);
+
+		$val = $user->validate();
+		if ($val !== TRUE) {
+			$this->show_form(_('Error saving user; invalid.'));
+			return;
+		}
+
+		if (!$user->update($original)) {
+			common_server_error(_('Can\'t save new password.'));
+			return;
+		}
+
+		$this->show_form(_('Password saved.'), true);
+	}
+
 }
diff --git a/lib/settingsaction.php b/lib/settingsaction.php
index 00bec4274b..cbdfcf10c6 100644
--- a/lib/settingsaction.php
+++ b/lib/settingsaction.php
@@ -86,9 +86,6 @@ class SettingsAction extends Action {
 				'emailsettings' =>
 				array(_('Email'),
 					  _('Change email handling')),
-				'password' =>
-				array(_('Password'),
-					  _('Change your password')),
 				'openidsettings' =>
 				array(_('OpenID'),
 					  _('Add or remove OpenIDs')),
diff --git a/lib/util.php b/lib/util.php
index 96e7819870..5b6b59f805 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -837,8 +837,6 @@ function common_fancy_url($action, $args=NULL) {
 		}
 	 case 'openidlogin':
 		return common_path('main/openid');
-	 case 'password':
-		return common_path('settings/'.$action);
 	 case 'profilesettings':
 		return common_path('settings/profile');
 	 case 'emailsettings':