diff --git a/ChangeLog b/ChangeLog
index adf41ac61..d836601c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #2609346 [operations] Fix copying views.
 - rfe #2127983 Readd documentation link, it does not protect against anything.
 - bug #1675249 [doc] Apache reverse proxy and cookies FAQ
+- bug #2682140 UUID() and CURRENT_USER() should not accept arguments
 
 3.1.3.0 (2009-02-28)
 + [lang] Turkish update, thanks to Burak Yavuz
diff --git a/tbl_replace.php b/tbl_replace.php
index 9386aa59e..dad5ce028 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -159,6 +159,8 @@ $func_no_param = array(
     'RAND',
     'USER',
     'LAST_INSERT_ID',
+    'UUID',
+    'CURRENT_USER',
 );
 
 foreach ($loop_array as $rowcount => $primary_key) {