diff --git a/libraries/advisor.class.php b/libraries/advisor.class.php
index 11e0119d9d..5d2ed60132 100644
--- a/libraries/advisor.class.php
+++ b/libraries/advisor.class.php
@@ -120,11 +120,18 @@ class Advisor
                     $rule['name'] = _gettext($rule['name']);
                     $rule['issue'] = _gettext($rule['issue']);
 
+                    // Replaces {server_variable} with 'server_variable' linking to server_variables.php
                     $rule['recommendation'] = preg_replace(
                         '/\{([a-z_0-9]+)\}/Ui',
-                        '<a href="server_variables.php' . PMA_generate_common_url() . '#filter=\1">\1</a>',
+                        '<a href="server_variables.php?' . PMA_generate_common_url() . '#filter=\1">\1</a>',
                         _gettext($rule['recommendation']));
 
+                    // Replaces external Links with PMA_linkURL() generated links
+                    $rule['recommendation'] = preg_replace(
+                        '#href=("|\')(https?://[^\1]+)\1#ie',
+                        '\'href="\' . PMA_linkURL("\2") . \'"\'',
+                        $rule['recommendation']
+                    );
                     break;
         }