diff --git a/ChangeLog b/ChangeLog
index c0f19cac1f..eecddc562f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog
 - issue #12588 ReCaptcha now works without allow_url_fopen
 - issue #12699 Show no local storage warning only on settings tab
 - issue #12765 Fixed SQL export with newlines
+- issue #12769 Edit/Export links are not clickable under Routines tab
 
 4.6.5.1 (2016-11-25)
 - issue #12735 Incorrect parameters to escapeString in Node.php
diff --git a/libraries/DatabaseInterface.php b/libraries/DatabaseInterface.php
index 96f40abb30..6bff7494e1 100644
--- a/libraries/DatabaseInterface.php
+++ b/libraries/DatabaseInterface.php
@@ -2135,7 +2135,7 @@ class DatabaseInterface
         if (Util::cacheExists('mysql_cur_user')) {
             return Util::cacheGet('mysql_cur_user');
         }
-        $user = $GLOBALS['dbi']->fetchValue('SELECT USER();');
+        $user = $GLOBALS['dbi']->fetchValue('SELECT CURRENT_USER();');
         if ($user !== false) {
             Util::cacheSet('mysql_cur_user', $user);
             return Util::cacheGet('mysql_cur_user');