diff --git a/application/modules/auth/controllers/IndexController.php b/application/modules/auth/controllers/IndexController.php
index 278647163b7a5f9542324ef7cdcfbd6eaec5f543..6e435bfdda339da5cb03365c3ac960c3bc45f23b 100644
--- a/application/modules/auth/controllers/IndexController.php
+++ b/application/modules/auth/controllers/IndexController.php
@@ -34,8 +34,6 @@ class Auth_IndexController extends App_Controller_Action {
 	
 	public function validateAction()
 	{
-	    $this->_disableLayoutAndView();
-	    
 		$username = $this->getRequest()->getParam('username');
 		$password = $this->getRequest()->getParam('password');
 		
@@ -65,6 +63,7 @@ class Auth_IndexController extends App_Controller_Action {
 			$session->errorMessage = 'Login Failed';
 			// Don't redirect, CAS is already doing it.
 			//$this->_redirect('/auth/index');
+            $this->_disableLayoutAndView();
 			return;
 		}
 		
@@ -73,7 +72,7 @@ class Auth_IndexController extends App_Controller_Action {
 			$user = Auth_UserModel::fetchNewFromLdap($auth->getIdentity());
 		}
 		
-		$this->_redirect('/');
+        $this->_redirect('/');
 	}
 
 }