diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index 2aad6c3900..96c46eca22 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -354,6 +354,10 @@ foreach ($supported_dbms as $dbms)
 			{
 				$orig_column_type = $column_data[0];
 				$column_type = $dbms_type_map[$dbms][$column_data[0]];
+				if ($column_type == 'text')
+				{
+					$modded_array[$column_name] = $column_type;
+				}
 			}
 
 			// Adjust default value if db-dependant specified
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 5fee2fc54c..b688f91aeb 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -637,7 +637,7 @@ CREATE TABLE phpbb_search_wordlist (
 	word_text text DEFAULT '' NOT NULL,
 	word_common tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	PRIMARY KEY (word_id),
-	UNIQUE wrd_txt (word_text)
+	UNIQUE wrd_txt (word_text(255))
 );
 
 
@@ -1032,7 +1032,7 @@ CREATE TABLE phpbb_users (
 	KEY user_birthday (user_birthday),
 	KEY user_email_hash (user_email_hash),
 	KEY user_type (user_type),
-	KEY username (username)
+	KEY username (username(255))
 );