Index: C:/Documents and Settings/Charles/workspace/portal-4.1.x-branch/portal-ejb/src/com/liferay/portlet/login/action/ViewAction.java
===================================================================
--- C:/Documents and Settings/Charles/workspace/portal-4.1.x-branch/portal-ejb/src/com/liferay/portlet/login/action/ViewAction.java	(revision 4033)
+++ C:/Documents and Settings/Charles/workspace/portal-4.1.x-branch/portal-ejb/src/com/liferay/portlet/login/action/ViewAction.java	(working copy)
@@ -32,9 +32,11 @@
 import com.liferay.portal.struts.PortletAction;
 import com.liferay.portal.theme.ThemeDisplay;
 import com.liferay.portal.util.Constants;
+import com.liferay.portal.util.PropsUtil;
 import com.liferay.portal.util.WebKeys;
 import com.liferay.portlet.ActionRequestImpl;
 import com.liferay.portlet.ActionResponseImpl;
+import com.liferay.util.GetterUtil;
 import com.liferay.util.ParamUtil;
 import com.liferay.util.Validator;
 import com.liferay.util.servlet.SessionErrors;
@@ -121,7 +123,16 @@
 
 		LoginAction.login(httpReq, httpRes, login, password, rememberMe);
 
-		res.sendRedirect(themeDisplay.getPathMain() + "/portal/protected");
+		if (GetterUtil.getBoolean(
+				PropsUtil.get(PropsUtil.PORTAL_JAAS_ENABLE))) {
+
+			res.sendRedirect(themeDisplay.getPathMain() + "/portal/protected");
+		}
+		else {
+			
+			res.sendRedirect(themeDisplay.getPathMain());
+		}
+
 	}
 
 }
\ No newline at end of file