diff --git a/tbl_addfield.php3 b/tbl_addfield.php3
index ca3163fff..ae157b07a 100755
--- a/tbl_addfield.php3
+++ b/tbl_addfield.php3
@@ -18,7 +18,8 @@ if (isset($submit)) {
     // Builds the field creation statement and alters the table
     for ($i = 0; $i < count($field_name); ++$i) {
         $query .= backquote($field_name[$i]) . ' ' . $field_type[$i];
-        if ($field_length[$i] != '') {
+        if ($field_length[$i] != ''
+            && !eregi('^(DATE|DATETIME|TIME|TINYBLOB|TINYTEXT|BLOB|TEXT|MEDIUMBLOB|MEDIUMTEXT|LONGBLOB|LONGTEXT)$', $field_type[$i])) {
 	        if (get_magic_quotes_gpc()) {
                 $query .= '(' . stripslashes($field_length[$i]) . ')';
 	        } else {
diff --git a/tbl_alter.php3 b/tbl_alter.php3
index 9c2df8d5d..3f2fa067b 100755
--- a/tbl_alter.php3
+++ b/tbl_alter.php3
@@ -27,35 +27,19 @@ if (isset($submit)) {
     if (!isset($query)) {
         $query = '';
     }
-    $query .= ' ' . backquote($field_orig[0]) . ' ' . backquote($field_name[0]) . ' ' . $field_type[0] . ' ';
+    $query .= ' ' . backquote($field_orig[0]) . ' ' . backquote($field_name[0]) . ' ' . $field_type[0];
     // Some field types shouldn't have lengths
-    switch (strtoupper($field_type[0]))
-    {
-        case 'DATE':
-        case 'DATETIME':
-        case 'TIME':
-        case 'TINYBLOB':
-        case 'TINYTEXT':
-        case 'BLOB':
-        case 'TEXT':
-        case 'MEDIUMBLOB':
-        case 'MEDIUMTEXT':
-        case 'LONGBLOB':
-        case 'LONGTEXT':
-            break;
-
-        default:
-            if ($field_length[0] != '') {
-                $query .= '(' . $field_length[0] . ') ';
-            };
-    };
+    if ($field_length[0] != ''
+        && !eregi('^(DATE|DATETIME|TIME|TINYBLOB|TINYTEXT|BLOB|TEXT|MEDIUMBLOB|MEDIUMTEXT|LONGBLOB|LONGTEXT)$', $field_type[0])) {
+        $query .= '(' . $field_length[0] . ')';
+    }
     if ($field_attribute[0] != '') {
-        $query .= $field_attribute[0] . ' ';
+        $query .= ' ' . $field_attribute[0];
     }
     if ($field_default[0] != '') {
-        $query .= 'DEFAULT \'' . sql_addslashes($field_default[0]) . '\' ';
+        $query .= ' DEFAULT \'' . sql_addslashes($field_default[0]) . '\'';
     }
-    $query .= $field_null[0] . ' ' . $field_extra[0];
+    $query .= ' ' . $field_null[0] . ' ' . $field_extra[0];
     if (get_magic_quotes_gpc()) {
         $query = stripslashes($query);
     }