diff --git a/ChangeLog b/ChangeLog
index 31b7d5664..dbc5ad36e 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2003-01-10 Marc Delisle  <lem9@users.sourceforge.net>
+    * tbl_change.php3: bug 665885, wrong back link after sql error
+
 2003-01-10 Michal Cihar  <nijel@users.sourceforge.net>
     * lang/czech*: Updated.
 
diff --git a/tbl_change.php3 b/tbl_change.php3
index 5e39b91ac..1b3e4e79a 100755
--- a/tbl_change.php3
+++ b/tbl_change.php3
@@ -58,13 +58,11 @@ if (get_magic_quotes_gpc()) {
 if (!isset($goto)) {
     $goto    = 'db_details.php3';
 }
-//if ($goto != 'db_details.php3' && $goto != 'tbl_properties.php3') {
 if (!ereg('^(db_details|tbl_properties|tbl_select)', $goto)) {
-    $err_url = $goto;
+    $err_url = $goto . "?" . PMA_generate_common_url($db) . "&amp;sql_query=" . urlencode($sql_query);
 } else {
     $err_url = $goto . '?'
              . PMA_generate_common_url($db)
-             //. (($goto == 'tbl_properties.php3') ? '&amp;table=' . urlencode($table) : '');
              . ((ereg('^(tbl_properties|tbl_select)', $goto)) ? '&amp;table=' . urlencode($table) : '');
 }