diff --git a/manage_user_edit_page.php b/manage_user_edit_page.php
index c413328..0209520 100644
--- a/manage_user_edit_page.php
+++ b/manage_user_edit_page.php
@@ -189,11 +189,22 @@
 <div class="border center">
 
 <!-- Reset/Unlock Button -->
-<?php if( $t_reset || $t_unlock ) { ?>
+<?php
+	if( $t_reset || $t_unlock ) {
+		# If resetting the user's own password, make the form redirect to My Account page
+		if( $t_reset && $t_user['id'] == auth_get_current_user_id() ) {
+?>
+	<form method="post" action="account_page.php">
+<?php
+		} else {
+?>
 	<form method="post" action="manage_user_reset.php">
-<?php echo form_security_field( 'manage_user_reset' ) ?>
+		<?php echo form_security_field( 'manage_user_reset' ) ?>
 		<input type="hidden" name="user_id" value="<?php echo $t_user['id'] ?>" />
-<?php if( $t_reset ) { ?>
+<?php
+		}
+		if( $t_reset ) {
+?>
 		<input type="submit" class="button" value="<?php echo lang_get( 'reset_password_button' ) ?>" />
 <?php } else { ?>
 		<input type="submit" class="button" value="<?php echo lang_get( 'account_unlock_button' ) ?>" />