diff --git a/lib/modules/Sql.pmod/mysql.pike b/lib/modules/Sql.pmod/mysql.pike
index 6e991edab41ee0dfaae05ca68ef91494db8818f9..2a5559ab2c9839e67dcc0f337f0bc9b1b7cc00be 100644
--- a/lib/modules/Sql.pmod/mysql.pike
+++ b/lib/modules/Sql.pmod/mysql.pike
@@ -1,5 +1,5 @@
 /*
- * $Id: mysql.pike,v 1.26 2006/08/12 03:06:06 mast Exp $
+ * $Id: mysql.pike,v 1.27 2006/08/12 03:27:27 mast Exp $
  *
  * Glue for the Mysql-module
  */
@@ -712,7 +712,9 @@ static void create(string|void host, string|void database,
 
     update_unicode_encode_mode_from_charset (lower_case (charset));
 
-    if (options->unicode_decode_mode)
+    if (charset == "unicode")
+      utf8_mode |= UNICODE_DECODE_MODE;
+    else if (options->unicode_decode_mode)
       set_unicode_decode_mode (1);
 
   } else {