diff --git a/ChangeLog b/ChangeLog
index e9bc7e413b..630d06c592 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,7 @@ phpMyAdmin - ChangeLog
 
 4.7.2 (not yet released)
 - issue #13314 Make theme selection keep current server
+- issue #13311 Fixed direct login for accounts without password
 
 4.7.1 (2017-05-25)
 - issue #13132 Always execute tracking queries as controluser
diff --git a/libraries/plugins/auth/AuthenticationCookie.php b/libraries/plugins/auth/AuthenticationCookie.php
index 25a5927efe..4d1e80e5e6 100644
--- a/libraries/plugins/auth/AuthenticationCookie.php
+++ b/libraries/plugins/auth/AuthenticationCookie.php
@@ -344,7 +344,7 @@ class AuthenticationCookie extends AuthenticationPlugin
 
             // The user just logged in
             $GLOBALS['PHP_AUTH_USER'] = PMA_sanitizeMySQLUser($_REQUEST['pma_username']);
-            $GLOBALS['PHP_AUTH_PW']   = $_REQUEST['pma_password'];
+            $GLOBALS['PHP_AUTH_PW'] = isset($_REQUEST['pma_password']) ? $_REQUEST['pma_password'] : '';
             if ($GLOBALS['cfg']['AllowArbitraryServer']
                 && isset($_REQUEST['pma_servername'])
             ) {