diff --git a/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-01.sql b/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-01.sql
index 9a11ef7c3abd9..cd40e0b8ae7b3 100644
--- a/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-01.sql
+++ b/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-01.sql
@@ -20,9 +20,11 @@ ALTER TABLE `#__content_types` DROP KEY `idx_alias`;
 ALTER TABLE `#__finder_links` DROP KEY `idx_title`;
 ALTER TABLE `#__menu` DROP KEY `idx_alias`;
 ALTER TABLE `#__menu` DROP KEY `idx_client_id_parent_id_alias_language`;
+ALTER TABLE `#__menu` DROP KEY `idx_path`;
 ALTER TABLE `#__redirect_links` DROP KEY `idx_old_url`;
 ALTER TABLE `#__tags` DROP KEY `idx_path`;
 ALTER TABLE `#__tags` DROP KEY `idx_alias`;
 ALTER TABLE `#__ucm_content` DROP KEY `idx_alias`;
 ALTER TABLE `#__ucm_content` DROP KEY `idx_title`;
 ALTER TABLE `#__ucm_content` DROP KEY `idx_content_type`;
+ALTER TABLE `#__users` DROP KEY `idx_name`;
diff --git a/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-02.sql b/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-02.sql
index 562892df3559b..fce7231c35699 100644
--- a/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-02.sql
+++ b/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-02.sql
@@ -23,12 +23,14 @@ ALTER TABLE `#__content_types` ADD KEY `idx_alias` (`type_alias`(100));
 ALTER TABLE `#__finder_links` ADD KEY `idx_title` (`title`(100));
 ALTER TABLE `#__menu` ADD KEY `idx_alias` (`alias`(100));
 ALTER TABLE `#__menu` ADD UNIQUE `idx_client_id_parent_id_alias_language` (`client_id`,`parent_id`,`alias`(100),`language`);
+ALTER TABLE `#__menu` ADD KEY `idx_path` (`path`(100));
 ALTER TABLE `#__redirect_links` ADD KEY `idx_old_url` (`old_url`(100));
 ALTER TABLE `#__tags` ADD KEY `idx_path` (`path`(100));
 ALTER TABLE `#__tags` ADD KEY `idx_alias` (`alias`(100));
 ALTER TABLE `#__ucm_content` ADD KEY `idx_alias` (`core_alias`(100));
 ALTER TABLE `#__ucm_content` ADD KEY `idx_title` (`core_title`(100));
 ALTER TABLE `#__ucm_content` ADD KEY `idx_content_type` (`core_type_alias`(100));
+ALTER TABLE `#__users` ADD KEY `idx_name` (`name`(100));
 
 --
 -- Step 2.2: Enlarge columns to avoid data loss on later conversion to utf8mb4
@@ -49,6 +51,7 @@ ALTER TABLE `#__tags` MODIFY `alias` varchar(400) NOT NULL DEFAULT '';
 ALTER TABLE `#__ucm_content` MODIFY `core_type_alias` varchar(400) NOT NULL DEFAULT '' COMMENT 'FK to the content types table';
 ALTER TABLE `#__ucm_content` MODIFY `core_title` varchar(400) NOT NULL;
 ALTER TABLE `#__ucm_content` MODIFY `core_alias` varchar(400) NOT NULL DEFAULT '';
+ALTER TABLE `#__users` MODIFY `name` varchar(400) NOT NULL DEFAULT '';
 
 --
 -- Step 2.3: Convert all tables to utf8mb4 chracter set with utf8mb4_unicode_ci collation
diff --git a/administrator/components/com_admin/sql/updates/mysql/3.5.1-2016-03-22.sql b/administrator/components/com_admin/sql/updates/mysql/3.5.1-2016-03-22.sql
new file mode 100644
index 0000000000000..f6c320b8cc24e
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/3.5.1-2016-03-22.sql
@@ -0,0 +1,5 @@
+--
+-- Make #__user_keys.user_id fit to #__users.username
+--
+
+ALTER TABLE `#__user_keys` MODIFY `user_id` varchar(150) NOT NULL;
diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql
index eb189ba95b8a1..ddbb7907a4d85 100644
--- a/installation/sql/mysql/joomla.sql
+++ b/installation/sql/mysql/joomla.sql
@@ -1883,7 +1883,7 @@ CREATE TABLE IF NOT EXISTS `#__users` (
 
 CREATE TABLE IF NOT EXISTS `#__user_keys` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `user_id` varchar(400) NOT NULL,
+  `user_id` varchar(150) NOT NULL,
   `token` varchar(255) NOT NULL,
   `series` varchar(191) NOT NULL,
   `invalid` tinyint(4) NOT NULL,
@@ -1893,7 +1893,7 @@ CREATE TABLE IF NOT EXISTS `#__user_keys` (
   UNIQUE KEY `series` (`series`),
   UNIQUE KEY `series_2` (`series`),
   UNIQUE KEY `series_3` (`series`),
-  KEY `user_id` (`user_id`(100))
+  KEY `user_id` (`user_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
 
 -- --------------------------------------------------------