FIND:

		if( $HTTP_POST_VARS['deleteuser'] )

REPLACE WITH:

		if( $HTTP_POST_VARS['deleteuser'] && ( $userdata['user_id'] != $user_id ) )

FIND:

		$user_avatar_local = ( isset( $HTTP_POST_VARS['avatarselect'] ) && !empty($HTTP_POST_VARS['submitavatar'] ) && $board_config['allow_avatar_local'] ) ? $HTTP_POST_VARS['avatarselect'] : ( ( isset( $HTTP_POST_VARS['avatarlocal'] )  ) ? $HTTP_POST_VARS['avatarlocal'] : '' );

AFTER, ADD:

		$user_avatar_category = ( isset($HTTP_POST_VARS['avatarcatname']) && $board_config['allow_avatar_local'] ) ? htmlspecialchars($HTTP_POST_VARS['avatarcatname']) : '' ;

FIND:

				$user_avatar = $user_avatar_local;

REPLACE WITH:

				$user_avatar = $user_avatar_category . '/' . $user_avatar_local;

FIND:

			$avatar_sql = ", user_avatar = '" . str_replace("\'", "''", $user_avatar_local) . "', user_avatar_type = " . USER_AVATAR_GALLERY;

REPLACE WITH:

			$avatar_sql = ", user_avatar = '" . str_replace("\'", "''", phpbb_ltrim(basename($user_avatar_category), "'") . '/' . phpbb_ltrim(basename($user_avatar_local), "'")) . "', user_avatar_type = " . USER_AVATAR_GALLERY;

FIND:

							$avatar_images[$file][$avatar_row_count][$avatar_col_count] = $file . "/" . $sub_file;

REPLACE WITH:

							$avatar_images[$file][$avatar_row_count][$avatar_col_count] = $sub_file;

FIND:

						"AVATAR_IMAGE" => "../" . $board_config['avatar_gallery_path'] . "/" . $avatar_images[$category][$i][$j])

REPLACE WITH:

						"AVATAR_IMAGE" => "../" . $board_config['avatar_gallery_path'] . '/' . $category . '/' . $avatar_images[$category][$i][$j])

FIND:

 NOTE --- This is a partial match, the whole line on a fresh installation looks like this:
			$s_hidden_fields = '<input type="hidden" name="mode" value="edit" /><input type="hidden" name="agreed" value="true" /><input type="hidden" name="coppa" value="' . $coppa . '" />';

<input type="hidden" name="mode" value="edit" />

IN-LINE FIND:

<input type="hidden" name="coppa" value="' . $coppa . '" />

IN-LINE AFTER, ADD:

<input type="hidden" name="avatarcatname" value="' . $category . '" />

FIND:

 NOTE --- This is a partial match, the whole line on a fresh installation looks like this:
			$s_hidden_fields .= '<input type="hidden" name="avatarlocal" value="' . $user_avatar_local . '" />';

<input type="hidden" name="avatarlocal" value="' . $user_avatar_local . '" />

IN-LINE FIND:

<input type="hidden" name="avatarlocal" value="' . $user_avatar_local . '" />

IN-LINE AFTER, ADD:

<input type="hidden" name="avatarcatname" value="' . $user_avatar_category . '" />