diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index 3ed82156..7133ff29 100644
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -14,6 +14,8 @@ Changes since 2.3.6 release
 ----------------------------------------------------------------
   - lt.lang, da.lang translation update
   - when enabling/disabling a mailbox, also update the corresponding alias
+  - fix creating superadmin in setup.php with MariaDB (more strict SQL)
+  - trim() localpart in create-mailbox to avoid mailbox names with leading space
 
 Version 2.3.6 - 2013/01/02 - SVN r1417 (postfixadmin-2.3 branch)
 ----------------------------------------------------------------
diff --git a/create-mailbox.php b/create-mailbox.php
index 6292d52b..48cb90f8 100644
--- a/create-mailbox.php
+++ b/create-mailbox.php
@@ -71,7 +71,7 @@ if ($_SERVER['REQUEST_METHOD'] == "GET")
 if ($_SERVER['REQUEST_METHOD'] == "POST")
 {
 
-    if (isset ($_POST['fUsername']) && isset ($_POST['fDomain'])) $fUsername = escape_string ($_POST['fUsername']) . "@" . escape_string ($_POST['fDomain']);
+    if (isset ($_POST['fUsername']) && isset ($_POST['fDomain'])) $fUsername = escape_string (trim($_POST['fUsername'])) . "@" . escape_string ($_POST['fDomain']);
     $fUsername = strtolower ($fUsername);
     if (isset ($_POST['fPassword'])) $fPassword = escape_string ($_POST['fPassword']);
     if (isset ($_POST['fPassword2'])) $fPassword2 = escape_string ($_POST['fPassword2']);