diff --git a/login/index.php b/login/index.php
index ffa03e15cab..70e8df287fd 100644
--- a/login/index.php
+++ b/login/index.php
@@ -85,7 +85,7 @@
 
 /// Check if the user has actually submitted login data to us
 
-    if ($frm and (get_moodle_cookie() == '')) {    // Login without cookie
+    if ($frm and (get_moodle_cookie() == '') and ($frm->username!='guest') and !$user) {    // Login without cookie
 
         $errormsg = get_string("cookiesnotenabled");