diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create
index 35572f223c..6551fea3ef 100755
--- a/debian/scripts/koha-create
+++ b/debian/scripts/koha-create
@@ -579,10 +579,8 @@ if [ "$op" = create ] || [ "$op" = request ] || [ "$op" = use ]
 then
     if [ "$mysqlpwd" = "" ]
     then
-        # over-size, so when problematic chars are removed,
-        # still likely 16 characters left.
-        mysqlpwd="$(pwgen -s -y 32 1)"
-        mysqlpwd="$(echo $mysqlpwd | tr -d :\'\\\<\>\/ | cut -c1-16)"
+        mysqlpwd="$(pwgen -s 15 1)"
+        mysqlpwd="$mysqlpwd@"
     fi
 else
     mysqlpwd="$(getinstancemysqlpassword $name)"