diff --git a/CHANGELOG.md b/CHANGELOG.md
index 14c063dfc..2135fc265 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
 - Improved BitTorrent clients ban functionality [\#1657](https://github.com/torrentpier/torrentpier/pull/1657) ([belomaxorka](https://github.com/belomaxorka))
 - Improved `filelist.php` [\#1586](https://github.com/torrentpier/torrentpier/pull/1586) ([belomaxorka](https://github.com/belomaxorka))
 - Invites: Permanent invites feature [\#1670](https://github.com/torrentpier/torrentpier/pull/1670) ([belomaxorka](https://github.com/belomaxorka))
+- Changed database encoding to `utf8mb4_unicode_ci` [\#1684](https://github.com/torrentpier/torrentpier/pull/1684) ([belomaxorka](https://github.com/belomaxorka))
 - Demo mode: Save user language in cookies [\#1584](https://github.com/torrentpier/torrentpier/pull/1584) ([belomaxorka](https://github.com/belomaxorka))
 - BBCode: Fixed relative links working [\#1613](https://github.com/torrentpier/torrentpier/pull/1613) ([belomaxorka](https://github.com/belomaxorka))
 - Fixed broken torrent stats displaying [\#1672](https://github.com/torrentpier/torrentpier/pull/1672), [\#1673](https://github.com/torrentpier/torrentpier/pull/1673) ([belomaxorka](https://github.com/belomaxorka))
diff --git a/install.php b/install.php
index d103eee72..60160c8ac 100644
--- a/install.php
+++ b/install.php
@@ -242,6 +242,8 @@ if (!is_file(BB_ROOT . 'vendor/autoload.php')) {
                 out('- Cannot remove Composer installation file (composer-setup.php). Please, delete it manually', 'warning');
             }
         }
+    } else {
+        out("- composer.phar file found!\n", 'success');
     }
 
     // Installing dependencies
@@ -290,7 +292,7 @@ if (is_file(BB_ROOT . '.env')) {
         if (trim($line) !== '' && !str_starts_with($line, '#')) {
             $parts = explode('=', $line, 2);
             $key = trim($parts[0]);
-            $value = isset($parts[1]) ? trim($parts[1]) : '';
+            $value = (isset($parts[1]) && $key !== 'DB_PASSWORD') ? trim($parts[1]) : '';
 
             // Database default values
             if (in_array($key, ['DB_HOST', 'DB_PORT', 'DB_DATABASE', 'DB_USERNAME', 'DB_PASSWORD'])) {
@@ -301,7 +303,7 @@ if (is_file(BB_ROOT . '.env')) {
             echo "Enter a new value for $key (or leave empty to not change): ";
             $newValue = readline();
 
-            if (!empty($newValue)) {
+            if (!empty($newValue) || $key === 'DB_PASSWORD') {
                 $line = "$key=$newValue";
                 // Configuring database connection
                 if (in_array($key, ['DB_HOST', 'DB_PORT', 'DB_DATABASE', 'DB_USERNAME', 'DB_PASSWORD'])) {
@@ -348,7 +350,7 @@ if (!empty($DB_HOST) && !empty($DB_DATABASE) && !empty($DB_USERNAME)) {
     }
 
     // Creating database if not exist
-    if ($conn->query("CREATE DATABASE IF NOT EXISTS $DB_DATABASE")) {
+    if ($conn->query("CREATE DATABASE IF NOT EXISTS $DB_DATABASE CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci")) {
         out('- Database created successfully!', 'success');
     } else {
         out("- Cannot create database: $DB_DATABASE", 'error');
diff --git a/install/sql/mysql.sql b/install/sql/mysql.sql
index 88cdfdfc1..858e4a7c9 100644
--- a/install/sql/mysql.sql
+++ b/install/sql/mysql.sql
@@ -12,7 +12,8 @@ CREATE TABLE IF NOT EXISTS `bb_attachments`
   PRIMARY KEY (`attach_id`, `post_id`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_attachments
@@ -29,7 +30,8 @@ CREATE TABLE IF NOT EXISTS `bb_attachments_config`
   PRIMARY KEY (`config_name`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_attachments_config
@@ -79,7 +81,8 @@ CREATE TABLE IF NOT EXISTS `bb_attachments_desc`
   KEY `physical_filename` (`physical_filename`(10))
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_attachments_desc
@@ -98,7 +101,8 @@ CREATE TABLE IF NOT EXISTS `bb_attach_quota`
   KEY `quota_type` (`quota_type`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_attach_quota
@@ -117,7 +121,8 @@ CREATE TABLE IF NOT EXISTS `bb_auth_access`
   KEY `forum_id` (`forum_id`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_auth_access
@@ -135,7 +140,8 @@ CREATE TABLE IF NOT EXISTS `bb_auth_access_snap`
   PRIMARY KEY (`user_id`, `forum_id`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_auth_access_snap
@@ -153,7 +159,8 @@ CREATE TABLE IF NOT EXISTS `bb_banlist`
   PRIMARY KEY (`ban_id`, `ban_userid`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_banlist
@@ -173,7 +180,8 @@ CREATE TABLE IF NOT EXISTS `bb_bt_dlstatus`
   KEY `topic_id` (`topic_id`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_bt_dlstatus
@@ -191,7 +199,8 @@ CREATE TABLE IF NOT EXISTS `bb_bt_dlstatus_snap`
   KEY `topic_id` (`topic_id`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_bt_dlstatus_snap
@@ -215,7 +224,8 @@ CREATE TABLE IF NOT EXISTS `bb_bt_last_torstat`
   PRIMARY KEY (`topic_id`, `user_id`) USING BTREE
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_bt_last_torstat
@@ -237,7 +247,8 @@ CREATE TABLE IF NOT EXISTS `bb_bt_last_userstat`
   PRIMARY KEY (`user_id`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_bt_last_userstat
@@ -254,7 +265,8 @@ CREATE TABLE IF NOT EXISTS `bb_bt_torhelp`
   PRIMARY KEY (`user_id`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_bt_torhelp
@@ -294,7 +306,8 @@ CREATE TABLE IF NOT EXISTS `bb_bt_torrents`
   KEY `poster_id` (`poster_id`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_bt_torrents
@@ -313,7 +326,8 @@ CREATE TABLE IF NOT EXISTS `bb_bt_torstat`
   PRIMARY KEY (`topic_id`, `user_id`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_bt_torstat
@@ -334,7 +348,8 @@ CREATE TABLE IF NOT EXISTS `bb_bt_tor_dl_stat`
   PRIMARY KEY (`topic_id`, `user_id`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_bt_tor_dl_stat
@@ -373,7 +388,8 @@ CREATE TABLE IF NOT EXISTS `bb_bt_tracker`
   KEY `user_id` (`user_id`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_bt_tracker
@@ -394,7 +410,8 @@ CREATE TABLE IF NOT EXISTS `bb_bt_tracker_snap`
   PRIMARY KEY (`topic_id`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_bt_tracker_snap
@@ -429,7 +446,8 @@ CREATE TABLE IF NOT EXISTS `bb_bt_users`
   UNIQUE KEY `auth_key` (`auth_key`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_bt_users
@@ -451,7 +469,8 @@ CREATE TABLE IF NOT EXISTS `bb_bt_user_settings`
   PRIMARY KEY (`user_id`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_bt_user_settings
@@ -470,7 +489,8 @@ CREATE TABLE IF NOT EXISTS `bb_categories`
   KEY `cat_order` (`cat_order`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_categories
@@ -489,7 +509,8 @@ CREATE TABLE IF NOT EXISTS `bb_config`
   PRIMARY KEY (`config_name`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_config
@@ -607,7 +628,8 @@ CREATE TABLE IF NOT EXISTS `bb_cron`
   UNIQUE KEY `script` (`cron_script`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_cron
@@ -669,7 +691,8 @@ CREATE TABLE IF NOT EXISTS `bb_disallow`
   PRIMARY KEY (`disallow_id`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_disallow
@@ -694,7 +717,8 @@ CREATE TABLE IF NOT EXISTS `bb_extensions`
   PRIMARY KEY (`ext_id`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_extensions
@@ -748,7 +772,8 @@ CREATE TABLE IF NOT EXISTS `bb_extension_groups`
   PRIMARY KEY (`group_id`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_extension_groups
@@ -805,7 +830,8 @@ CREATE TABLE IF NOT EXISTS `bb_forums`
   KEY `forum_parent` (`forum_parent`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_forums
@@ -839,7 +865,8 @@ CREATE TABLE IF NOT EXISTS `bb_groups`
   KEY `group_single_user` (`group_single_user`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_groups
@@ -866,7 +893,8 @@ CREATE TABLE IF NOT EXISTS `bb_log`
   FULLTEXT KEY `log_topic_title` (`log_topic_title`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_log
@@ -885,7 +913,8 @@ CREATE TABLE IF NOT EXISTS `bb_poll_users`
   PRIMARY KEY (`topic_id`, `user_id`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_poll_users
@@ -904,7 +933,8 @@ CREATE TABLE IF NOT EXISTS `bb_poll_votes`
   PRIMARY KEY (`topic_id`, `vote_id`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_poll_votes
@@ -939,7 +969,8 @@ CREATE TABLE IF NOT EXISTS `bb_posts`
   KEY `forum_id_post_time` (`forum_id`, `post_time`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_posts
@@ -959,7 +990,8 @@ CREATE TABLE IF NOT EXISTS `bb_posts_html`
   PRIMARY KEY (`post_id`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_posts_html
@@ -977,7 +1009,8 @@ CREATE TABLE IF NOT EXISTS `bb_posts_search`
   FULLTEXT KEY `search_words` (`search_words`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_posts_search
@@ -994,7 +1027,8 @@ CREATE TABLE IF NOT EXISTS `bb_posts_text`
   PRIMARY KEY (`post_id`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_posts_text
@@ -1021,7 +1055,8 @@ CREATE TABLE IF NOT EXISTS `bb_privmsgs`
   KEY `privmsgs_to_userid` (`privmsgs_to_userid`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_privmsgs
@@ -1038,7 +1073,8 @@ CREATE TABLE IF NOT EXISTS `bb_privmsgs_text`
   PRIMARY KEY (`privmsgs_text_id`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_privmsgs_text
@@ -1056,7 +1092,8 @@ CREATE TABLE IF NOT EXISTS `bb_quota_limits`
   PRIMARY KEY (`quota_limit_id`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_quota_limits
@@ -1079,7 +1116,8 @@ CREATE TABLE IF NOT EXISTS `bb_ranks`
   PRIMARY KEY (`rank_id`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_ranks
@@ -1107,7 +1145,8 @@ CREATE TABLE IF NOT EXISTS `bb_search_rebuild`
   PRIMARY KEY (`rebuild_session_id`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_search_rebuild
@@ -1132,7 +1171,8 @@ CREATE TABLE IF NOT EXISTS `bb_search_results`
   PRIMARY KEY (`session_id`, `search_type`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_search_results
@@ -1156,7 +1196,8 @@ CREATE TABLE IF NOT EXISTS `bb_sessions`
   PRIMARY KEY (`session_id`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_sessions
@@ -1175,7 +1216,8 @@ CREATE TABLE IF NOT EXISTS `bb_smilies`
   PRIMARY KEY (`smilies_id`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_smilies
@@ -1268,7 +1310,8 @@ CREATE TABLE IF NOT EXISTS `bb_topics`
   FULLTEXT KEY `topic_title` (`topic_title`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_topics
@@ -1293,7 +1336,8 @@ CREATE TABLE IF NOT EXISTS `bb_topics_watch`
   KEY `notify_status` (`notify_status`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_topics_watch
@@ -1320,7 +1364,8 @@ CREATE TABLE IF NOT EXISTS `bb_topic_tpl`
   UNIQUE KEY `tpl_name` (`tpl_name`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_topic_tpl
@@ -1378,7 +1423,8 @@ CREATE TABLE IF NOT EXISTS `bb_users`
   KEY `user_level` (`user_level`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_users
@@ -1423,7 +1469,8 @@ CREATE TABLE IF NOT EXISTS `bb_user_group`
   KEY `user_id` (`user_id`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_user_group
@@ -1441,7 +1488,8 @@ CREATE TABLE IF NOT EXISTS `bb_words`
   PRIMARY KEY (`word_id`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_words
@@ -1459,7 +1507,8 @@ CREATE TABLE IF NOT EXISTS `buf_last_seeder`
   PRIMARY KEY (`topic_id`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of buf_last_seeder
@@ -1477,7 +1526,8 @@ CREATE TABLE IF NOT EXISTS `bb_thx`
   PRIMARY KEY (`topic_id`, `user_id`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of bb_thx
@@ -1494,7 +1544,8 @@ CREATE TABLE IF NOT EXISTS `buf_topic_view`
   PRIMARY KEY (`topic_id`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 -- ----------------------------
 -- Records of buf_topic_view
diff --git a/install/upgrade/legacy-changes.txt b/install/upgrade/legacy-changes.txt
index 89aad9de9..b874a17f3 100644
--- a/install/upgrade/legacy-changes.txt
+++ b/install/upgrade/legacy-changes.txt
@@ -101,7 +101,8 @@ CREATE TABLE IF NOT EXISTS `bb_thx`
   PRIMARY KEY (`topic_id`, `user_id`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 // 2.4.0
 UPDATE `bb_attachments_config` SET `config_value` = 'data/uploads' WHERE `config_name` = 'upload_dir';
@@ -124,7 +125,8 @@ CREATE TABLE IF NOT EXISTS `bb_banlist`
   PRIMARY KEY (`ban_id`, `ban_userid`)
 )
   ENGINE = MyISAM
-  DEFAULT CHARSET = utf8mb4;
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
 
 // 2.4.1
 UPDATE `bb_config` SET `config_value` = '' WHERE `config_name` = 'bt_announce_url';
diff --git a/styles/templates/default/page_header.tpl b/styles/templates/default/page_header.tpl
index 97d6f268d..0ec86069b 100644
--- a/styles/templates/default/page_header.tpl
+++ b/styles/templates/default/page_header.tpl
@@ -4,7 +4,7 @@
 <meta charset="utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=Edge">
 <meta name="viewport" content="initial-scale=1.0">
-<meta name="generator" content="TorrentPier">
+<meta name="generator" content="{#APP_NAME#}">
 <title><!-- IF HAVE_NEW_PM -->({HAVE_NEW_PM}) <!-- ENDIF --><!-- IF PAGE_TITLE -->{PAGE_TITLE} :: {SITENAME}<!-- ELSE -->{SITENAME}<!-- ENDIF --></title>
 <meta name="apple-mobile-web-app-title" content="{SITENAME}">
 <meta name="application-name" content="{SITENAME}"/>