diff --git a/phpBB/db/schemas/mysql_schema.sql b/phpBB/db/schemas/mysql_schema.sql
index a5e27e797c..7336031611 100644
--- a/phpBB/db/schemas/mysql_schema.sql
+++ b/phpBB/db/schemas/mysql_schema.sql
@@ -42,7 +42,7 @@ CREATE TABLE phpbb_user_group (
 # Table structure for table 'phpbb_groups'
 #
 CREATE TABLE phpbb_groups (
-   group_id mediumint(8) NOT NULL,
+   group_id mediumint(8) NOT NULL AUTO INCREMENT,
    group_type tinyint(4) DEFAULT '1' NOT NULL, 
    group_name varchar(40) NOT NULL,
    group_description varchar(255) NOT NULL,
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 38dfae8654..ad2e9eb74e 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -178,4 +178,4 @@ define('VOTE_DESC_TABLE', $table_prefix.'vote_desc');
 define('VOTE_RESULTS_TABLE', $table_prefix.'vote_results');
 define('VOTE_USERS_TABLE', $table_prefix.'vote_voters');
 
-?>
\ No newline at end of file
+?>
diff --git a/phpBB/includes/emailer.php b/phpBB/includes/emailer.php
index 10d22f2822..29f6588fae 100755
--- a/phpBB/includes/emailer.php
+++ b/phpBB/includes/emailer.php
@@ -151,7 +151,7 @@ class emailer
 
 		$this->msg = ( isset($match[5]) ) ? trim($match[5]) : '';
 		$this->subject = ( $this->subject != '' ) ? $this->subject : trim($match[2]);
-		$this->encoding = ( trim($match[4]) != '' ) ? trim($match[4]) : 'iso-8859-1';
+		$this->encoding = ( trim($match[4]) != '' ) ? trim($match[4]) : $lang['ENCODING'];
 
 		return true;
 	}
@@ -209,7 +209,7 @@ class emailer
 	{
 		$mime_boundary = "--==================_846811060==_";
 
-		$this->mailMsg = '--' . $mime_boundary . "\nContent-Type: text/plain;\n\tcharset=\"iso-8859-1\"\n\n" . $this->mailMsg;
+		$this->mailMsg = '--' . $mime_boundary . "\nContent-Type: text/plain;\n\tcharset=\"" . $lang['ENCODING'] . "\"\n\n" . $this->mailMsg;
 
 		if ($mime_filename)
 		{
@@ -305,4 +305,4 @@ class emailer
 
 } // class emailer
 
-?>
\ No newline at end of file
+?>
diff --git a/phpBB/includes/usercp_register.php b/phpBB/includes/usercp_register.php
index b2c7fc1059..18a95e73de 100644
--- a/phpBB/includes/usercp_register.php
+++ b/phpBB/includes/usercp_register.php
@@ -659,6 +659,7 @@ if ( $error )
 	$occupation = htmlspecialchars(stripslashes($occupation));
 	$interests = htmlspecialchars(stripslashes($interests));
 	$signature = stripslashes($signature);
+	$signature = ( $signature_bbcode_uid != '' ) ? preg_replace("/:(([a-z0-9]+:)?)$signature_bbcode_uid\]/si", ']', $signature) : $signature;
 
 	$user_lang = stripslashes($user_lang);
 	$user_dateformat = stripslashes($user_dateformat);
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 8a6caa322d..a1ded0646d 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -110,7 +110,7 @@ if ( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
 
 	switch( $mode )
 	{
-		case 'joined':
+		case 'joindate':
 			$order_by = "user_regdate ASC LIMIT $start, " . $board_config['topics_per_page'];
 			break;
 		case 'username':
@@ -305,4 +305,4 @@ $template->pparse('body');
 
 include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
 
-?>
\ No newline at end of file
+?>
diff --git a/phpBB/upgrade.php b/phpBB/upgrade.php
index d9efa94e3c..b23eeb860d 100644
--- a/phpBB/upgrade.php
+++ b/phpBB/upgrade.php
@@ -1789,7 +1789,7 @@ if ( !empty($next) )
 			$sql = "UPDATE " . $table_prefix . "config 
 				SET config_value = '" . $script_path . "'
 				WHERE config_name = 'script_path'";
-			query($sql, "Couldn't insert Board admin email");
+			query($sql, "Couldn't insert Board script path");
 			
 			//
 			// Change session table to HEAP if MySQL version matches
@@ -1932,4 +1932,4 @@ print "<br />If the upgrade completed without error you may click <a href=\"inde
 
 common_footer();
 
-?>
\ No newline at end of file
+?>