diff --git a/index.php b/index.php
index d1c01a6dfaa4c52be58a07a8108dfcb2968cf7a1..b0d48b4acff0970c5da2100cb1fe4ee38886c559 100644
--- a/index.php
+++ b/index.php
@@ -39,19 +39,15 @@ if(count($errors)>0){
 		header( "Location: ".$WEBROOT.'/'.OC_APPCONFIG::getValue( "core", "defaultpage", "files/index.php" ));
 		exit();
 	}
-}else{
+}elseif(isset($_POST["user"])){
 	if( OC_USER::login( $_POST["user"], $_POST["password"] )){
 		header( "Location: ".$WEBROOT.'/'.OC_APPCONFIG::getValue( "core", "defaultpage", "files/index.php" ));
 		exit();
+	}else{
+		OC_TEMPLATE::printGuestPage( "", "login", array( "error" => true));
 	}
-	else{
-		$error = false;
-		// Say "bad login" in case the user wanted to login
-		if( $_POST["user"] && $_POST["password"] ){
-			$error = true;
-		}
-		OC_TEMPLATE::printGuestPage( "", "login", array( "error" => $error ));
-	}
+}else{
+	OC_TEMPLATE::printGuestPage( "", "login", array( "error" => false ));
 }
 
 ?>