diff --git a/auth/cas/auth.php b/auth/cas/auth.php
index 20872e04001..e80e51f8ba8 100644
--- a/auth/cas/auth.php
+++ b/auth/cas/auth.php
@@ -102,11 +102,7 @@ class auth_plugin_cas extends auth_plugin_base {
 		  return;
 		  }
 
-	  if ($_GET["loginguest"]== true) {
-			$frm->username="guest";
-			$frm->password="guest";
-			return;
-	  }
+
 		  
 // Connection to CAS server
 	 $this->connectCAS();
@@ -119,6 +115,12 @@ class auth_plugin_cas extends auth_plugin_base {
 		$frm->password="passwdCas";		  
 		return;
 	 }	 	
+
+	  if ($_GET["loginguest"]== true) {
+			$frm->username="guest";
+			$frm->password="guest";
+			return;
+	  }
 	 
      if ($this->config->multiauth) {
           $authCAS = optional_param("authCAS");