diff --git a/controllers/class.Login.php b/controllers/class.Login.php
index 380253277..3d6f5634a 100644
--- a/controllers/class.Login.php
+++ b/controllers/class.Login.php
@@ -58,17 +58,15 @@ class SeedDMS_Controller_Login extends SeedDMS_Controller_Common {
 		 */
 		if(!$user && $settings->_enableGuestLogin && (int) $settings->_guestID) {
 			$guestUser = $dms->getUser((int) $settings->_guestID);
-			if(!$guestUser) {
-				$this->setErrorMsg("login_error_text");
-				return false;
-			}
-			if(($login != $guestUser->getLogin())) {
-				if ((!isset($pwd) || strlen($pwd)==0)) {
-					$this->setErrorMsg("login_error_text");
-					return false;
+			if($guestUser) {
+				if(($login != $guestUser->getLogin())) {
+					if ((!isset($pwd) || strlen($pwd)==0)) {
+						$this->setErrorMsg("login_error_text");
+						return false;
+					}
+				} else {
+					$user = $guestUser;
 				}
-			} else {
-				$user = $guestUser;
 			}
 		}