Index: class.tx_felogin_pi1.php
===================================================================
--- class.tx_felogin_pi1.php	(revision 6566)
+++ class.tx_felogin_pi1.php	(working copy)
@@ -104,7 +104,15 @@
 			$this->redirectUrl = $this->processRedirect();
 		}
 
-
+			// Process the redirect
+		if (($this->logintype === 'login' || $this->logintype === 'logout') && $this->redirectUrl && !$this->noRedirect) {
+			if (!$GLOBALS['TSFE']->fe_user->cookieId) {
+				$content .= '<p style="color:red; font-weight:bold;">' . $this->pi_getLL('cookie_warning', '', 1) . '</p>';
+			} else {
+				t3lib_utility_Http::redirect($this->redirectUrl);
+			}
+		}
+		
 			// What to display
 		$content='';
 		if ($this->piVars['forgot']) {
@@ -119,16 +127,6 @@
 			}
 		}
 
-
-
-			// Process the redirect
-		if (($this->logintype === 'login' || $this->logintype === 'logout') && $this->redirectUrl && !$this->noRedirect) {
-			if (!$GLOBALS['TSFE']->fe_user->cookieId) {
-				$content .= '<p style="color:red; font-weight:bold;">' . $this->pi_getLL('cookie_warning', '', 1) . '</p>';
-			} else {
-				t3lib_utility_Http::redirect($this->redirectUrl);
-			}
-		}
 		return $this->conf['wrapContentInBaseClass'] ? $this->pi_wrapInBaseClass($content) : $content;
 
 	}