diff --git a/ChangeLog b/ChangeLog
index 1c8c240b2..e5afdcc29 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - ChangeLog
 $Id$
 $Source$
 
+2006-05-26 Marc Delisle  <lem9@users.sourceforge.net>
+    * tbl_change.php: bug #1451426, edit breaks protected BLOB field, 
+      changes it from NULL to empty string
+
 2006-05-23 Marc Delisle  <lem9@users.sourceforge.net>
     * tbl_change.php, tbl_replace.php: bug #1438999, updating a multi-table
       view
diff --git a/tbl_change.php b/tbl_change.php
index dc4ac302f..ccfd36639 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -565,43 +565,48 @@ foreach ($loop_array AS $vrowcount => $vrow) {
             }
         } // end if ($cfg['ShowFunctionFields'])
 
+
         // The null column
         // ---------------
         echo '        <td>' . "\n";
-        if (!(($cfg['ProtectBinary'] && $is_blob) || ($cfg['ProtectBinary'] == 'all' && $is_binary))
-            && $row_table_def['Null'] == 'YES') {
-
+        if ($row_table_def['Null'] == 'YES') {
             echo '            <input type="hidden" name="fields_null_prev' . $vkey . '[' . urlencode($field) . ']"';
             if ($real_null_value && !$first_timestamp) {
-                //echo ' checked="checked"';
                 echo ' value="on"';
             }
             echo ' />' . "\n";
 
-            echo '            <input type="checkbox" tabindex="' . ($tabindex + $tabindex_for_null) . '"'
-                 . ' name="fields_null' . $vkey . '[' . urlencode($field) . ']"';
-            if ($real_null_value && !$first_timestamp) {
-                echo ' checked="checked"';
-            }
-            echo ' id="field_' . ($idindex) . '_2"';
-            $onclick         = ' onclick="if (this.checked) {nullify(';
-            if (strstr($row_table_def['True_Type'], 'enum')) {
-                if (strlen($row_table_def['Type']) > 20) {
-                    $onclick .= '1, ';
-                } else {
-                    $onclick .= '2, ';
+            if (!(($cfg['ProtectBinary'] && $is_blob) || ($cfg['ProtectBinary'] == 'all' && $is_binary)) ) {
+
+                echo '            <input type="checkbox" tabindex="' . ($tabindex + $tabindex_for_null) . '"'
+                     . ' name="fields_null' . $vkey . '[' . urlencode($field) . ']"';
+                if ($real_null_value && !$first_timestamp) {
+                    echo ' checked="checked"';
                 }
-            } elseif (strstr($row_table_def['True_Type'], 'set')) {
-                $onclick     .= '3, ';
-            } elseif ($foreigners && isset($foreigners[$field])) {
-                $onclick     .= '4, ';
+                echo ' id="field_' . ($idindex) . '_2"';
+                $onclick         = ' onclick="if (this.checked) {nullify(';
+                if (strstr($row_table_def['True_Type'], 'enum')) {
+                    if (strlen($row_table_def['Type']) > 20) {
+                        $onclick .= '1, ';
+                    } else {
+                        $onclick .= '2, ';
+                    }
+                } elseif (strstr($row_table_def['True_Type'], 'set')) {
+                    $onclick     .= '3, ';
+                } elseif ($foreigners && isset($foreigners[$field])) {
+                    $onclick     .= '4, ';
+                } else {
+                    $onclick     .= '5, ';
+                }
+                $onclick         .= '\'' . urlencode($field) . '\', \'' . md5($field) . '\', \'' . $vkey . '\'); this.checked = true}; return true" />' . "\n";
+                echo $onclick;
             } else {
-                $onclick     .= '5, ';
+                echo '            <input type="hidden" name="fields_null' . $vkey . '[' . urlencode($field) . ']"';
+                if ($real_null_value && !$first_timestamp) {
+                    echo ' value="on"';
+                }
+                echo ' />' . "\n";
             }
-            $onclick         .= '\'' . urlencode($field) . '\', \'' . md5($field) . '\', \'' . $vkey . '\'); this.checked = true}; return true" />' . "\n";
-            echo $onclick;
-        } else {
-            echo '            &nbsp;' . "\n";
         }
         echo '        </td>' . "\n";