diff --git a/ChangeLog b/ChangeLog
index ac968346e9..6b62e34db2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,7 @@ phpMyAdmin - ChangeLog
 - issue        Fix php notice "Trying to access array offset on value of type bool" on Designer
 - issue #13326 Added integer validations on search page
 - issue #15200 Fixed server-side HTTPS detection misses support for Forwarded HTTP Extension (RFC 7239)
+- issue #15831 Fixed DB names starting with "b" being cut off in <option>, User account page
 
 5.0.1 (2020-01-07)
 - issue #15719 Fixed error 500 when browsing a table when $cfg['LimitChars'] used a string and not an int value
diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php
index aeeebcdfc4..2fb6b066ed 100644
--- a/libraries/classes/Util.php
+++ b/libraries/classes/Util.php
@@ -1438,9 +1438,9 @@ class Util
      *
      * @return string the converted value
      */
-    public static function convertBitDefaultValue($bit_default_value)
+    public static function convertBitDefaultValue(string $bit_default_value): string
     {
-        return rtrim(ltrim(htmlspecialchars_decode($bit_default_value, ENT_QUOTES), "b'"), "'");
+        return (string) preg_replace("/^b'(\d*)'?$/", '$1', htmlspecialchars_decode($bit_default_value, ENT_QUOTES), 1);
     }
 
     /**
diff --git a/test/classes/UtilTest.php b/test/classes/UtilTest.php
index e53c3517bd..075e96995e 100644
--- a/test/classes/UtilTest.php
+++ b/test/classes/UtilTest.php
@@ -369,6 +369,22 @@ class UtilTest extends PmaTestCase
                 "b'010111010'",
                 '010111010',
             ],
+            'database name starting with b' => [
+                'big database',
+                'big database',
+            ],
+            "database name containing b'" => [
+                "a b'ig database",
+                "a b'ig database",
+            ],
+            'database name in single quotes' => [
+                "'a*database*name'",
+                "'a*database*name'",
+            ],
+            "database name with multiple b'" => [
+                "b'ens datab'ase'",
+                "b'ens datab'ase'",
+            ],
         ];
     }