diff --git a/ChangeLog b/ChangeLog
index a8288e1f2..b374328a8 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2002-02-23 Marc Delisle  <lem9@users.sourceforge.net>
+	* tbl_replace.php3, bug 520242, records get inserted twice
+
 2002-02-22 Loïc Chapeaux  <lolo@phpheaven.net>
 	* tbl_addfield.php3, lines 34-44; tbl_create.php3, lines 40-50: fixed php
 	  warnings (see bug #521751).
diff --git a/tbl_replace.php3 b/tbl_replace.php3
index 2727dd31c..5de16df19 100755
--- a/tbl_replace.php3
+++ b/tbl_replace.php3
@@ -8,7 +8,6 @@
 require('./libraries/grab_globals.lib.php3');
 require('./libraries/common.lib.php3');
 
-
 /**
  * Initializes some variables
  */
@@ -30,7 +29,8 @@ if (isset($after_insert) && $after_insert == 'new_insert') {
           . '&repeat_cells=' . $repeat_cells
           . (empty($sql_query) ? '' : '&sql_query=' . urlencode($sql_query));
 } else if ($goto == 'sql.php3'
-           || ($goto == 'tbl_properties.php3' && !empty($sql_query))) {
+           || ($goto == 'tbl_properties.php3' 
+              && eregi('^SELECT[[:space:]]+', $sql_query))) {
     $goto = 'sql.php3?'
           . 'lang=' . $lang
           . '&server=' . $server