Index: lams_central/src/java/org/lamsfoundation/lams/security/JspRedirectStrategy.java
===================================================================
diff -u -rc0538192a8a416d69bba9bd202822ff0f6109f94 -ra1043ecece1129ca596760478464f5498c3c7c0b
--- lams_central/src/java/org/lamsfoundation/lams/security/JspRedirectStrategy.java	(.../JspRedirectStrategy.java)	(revision c0538192a8a416d69bba9bd202822ff0f6109f94)
+++ lams_central/src/java/org/lamsfoundation/lams/security/JspRedirectStrategy.java	(.../JspRedirectStrategy.java)	(revision a1043ecece1129ca596760478464f5498c3c7c0b)
@@ -75,15 +75,10 @@
 		String checkStatus = (String) session.getAttribute(AUTH_OBJECT_NAME);
 		String id = session.getId();
 
-		if (checkStatus == null) {
-			log.debug("===>LOGIN PAGE: there is no auth obj in session, auth obj created. session id: " + id);
+		if (checkStatus == null || checkStatus.equals(SECURITY_CHECK_NOT_PASSED)) {
+			log.debug("===>LOGIN PAGE: there is no auth obj in session or accessing login page before login succeed, auth obj created. session id: " + id);
 			session.setAttribute(AUTH_OBJECT_NAME, SECURITY_CHECK_NOT_PASSED);
 		
-			response.sendRedirect(WELCOME_PAGE);
-			return true;
-		} else if (checkStatus.equals(SECURITY_CHECK_NOT_PASSED)) {
-			log.debug("===>LOGIN PAGE: accessing login page before login succeed, display login page. session id: "+ id);
-			//set local information for login page. Because login.jsp does not pass thru any filters.
 			try {
 				LocaleFilter filter = new LocaleFilter();
 				filter.doFilter(request, response, null);
Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java
===================================================================
diff -u -r413ef9db9a94b751e76d21c66a2300c79e95e24a -ra1043ecece1129ca596760478464f5498c3c7c0b
--- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java	(.../HomeAction.java)	(revision 413ef9db9a94b751e76d21c66a2300c79e95e24a)
+++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java	(.../HomeAction.java)	(revision a1043ecece1129ca596760478464f5498c3c7c0b)
@@ -65,7 +65,7 @@
  * @struts:action-forward name="error" path=".error"
  * @struts:action-forward name="message" path=".message"
  * @struts:action-forward name="passwordChange" path=".passwordChange"
- * @struts:action-forward name="index" path="/login.jsp"
+ * @struts:action-forward name="index" path="/index.jsp"
  *
  */
 public class HomeAction extends DispatchAction {
Index: lams_central/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r775fdedefed0e3a8ae170d1e82fe1a5a58437e28 -ra1043ecece1129ca596760478464f5498c3c7c0b
--- lams_central/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 775fdedefed0e3a8ae170d1e82fe1a5a58437e28)
+++ lams_central/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision a1043ecece1129ca596760478464f5498c3c7c0b)
@@ -14,13 +14,13 @@
   <form-beans>
 
     <form-bean
-      name="PasswordChangeActionForm"
-      type="org.lamsfoundation.lams.web.PasswordChangeActionForm"
-    />
-    <form-bean
       name="PortraitActionForm"
       type="org.lamsfoundation.lams.web.PortraitActionForm"
     />
+    <form-bean
+      name="PasswordChangeActionForm"
+      type="org.lamsfoundation.lams.web.PasswordChangeActionForm"
+    />
 
    <form-bean name="UserForm" type="org.apache.struts.action.DynaActionForm">
 	<form-property name="userId" type="java.lang.Integer" />
@@ -71,220 +71,146 @@
   <!-- ========== Action Mapping Definitions =================================== -->
    <action-mappings>
     <action
-      path="/launchlearner"
-      type="org.lamsfoundation.lams.web.LaunchLearnerAction"
-      parameter="mod"
+      path="/passwordChanged"
+      type="org.lamsfoundation.lams.web.PasswordChangeAction"
+      name="PasswordChangeActionForm"
+      scope="request"
+      input=".passwordChange"
       unknown="false"
       validate="false"
     >
       <forward
-        name="learner"
-        path="/launchlearner.jsp"
+        name="okay"
+        path="/index.do?state=active&amp;tab=passwordChanged"
         redirect="false"
       />
       <forward
-        name="error"
-        path=".error"
+        name="cancelled"
+        path="/index.do?state=active&amp;tab=profile"
         redirect="false"
       />
       <forward
-        name="message"
-        path=".message"
+        name="errors"
+        path="/index.do?state=active&amp;tab=password"
         redirect="false"
       />
     </action>
     <action
-      path="/home"
-      type="org.lamsfoundation.lams.web.HomeAction"
-      parameter="method"
+      path="/authoring/importToolContent"
+      type="org.lamsfoundation.lams.authoring.web.ImportToolContentAction"
+      name="ImportAction"
+      scope="request"
       unknown="false"
       validate="false"
     >
       <forward
-        name="sysadmin"
-        path="/sysadmin.jsp"
+        name="upload"
+        path="/toolcontent/import.jsp"
         redirect="false"
       />
       <forward
-        name="learner"
-        path="/learner.jsp"
+        name="success"
+        path="/toolcontent/importresult.jsp"
         redirect="false"
       />
-      <forward
-        name="author"
-        path="/author.jsp"
-        redirect="false"
-      />
-      <forward
-        name="monitorLesson"
-        path="/monitorLesson.jsp"
-        redirect="false"
-      />
-      <forward
-        name="addLesson"
-        path="/addLesson.jsp"
-        redirect="false"
-      />
-      <forward
-        name="error"
-        path=".error"
-        redirect="false"
-      />
-      <forward
-        name="message"
-        path=".message"
-        redirect="false"
-      />
-      <forward
-        name="passwordChange"
-        path=".passwordChange"
-        redirect="false"
-      />
-      <forward
-        name="index"
-        path="/login.jsp"
-        redirect="false"
-      />
     </action>
     <action
-      path="/saveprofile"
-      type="org.lamsfoundation.lams.web.ProfileSaveAction"
+      path="/profile"
+      type="org.lamsfoundation.lams.web.ProfileAction"
       name="UserForm"
       scope="request"
-      input=".editprofile"
+      parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="profile"
-        path="/index.do?state=active&amp;tab=profile"
+        name="view"
+        path=".profile"
         redirect="false"
       />
       <forward
-        name="editprofile"
-        path="/index.do?state=active&amp;tab=editprofile"
+        name="edit"
+        path=".editprofile"
         redirect="false"
       />
     </action>
     <action
-      path="/authoring/importToolContent"
-      type="org.lamsfoundation.lams.authoring.web.ImportToolContentAction"
-      name="ImportAction"
-      scope="request"
+      path="/workspace"
+      type="org.lamsfoundation.lams.workspace.web.WorkspaceAction"
+      parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="upload"
-        path="/toolcontent/import.jsp"
-        redirect="false"
-      />
-      <forward
         name="success"
-        path="/toolcontent/importresult.jsp"
+        path="/index.jsp"
         redirect="false"
       />
     </action>
     <action
-      path="/theme"
-      type="org.lamsfoundation.lams.themes.web.ThemeAction"
-      name="ThemeAction"
-      scope="request"
-      parameter="method"
+      path="/index"
+      type="org.lamsfoundation.lams.web.IndexAction"
       unknown="false"
       validate="false"
     >
-    </action>
-    <action
-      path="/authoring/author"
-      type="org.lamsfoundation.lams.authoring.web.AuthoringAction"
-      name="AuthoringAction"
-      scope="request"
-      parameter="method"
-      unknown="false"
-      validate="false"
-    >
-    </action>
-    <action
-      path="/authoring/exportToolContent"
-      type="org.lamsfoundation.lams.authoring.web.ExportToolContentAction"
-      name="ExportAction"
-      scope="request"
-      unknown="false"
-      validate="false"
-    >
       <forward
-        name="choice"
-        path="/toolcontent/exportchoice.jsp"
+        name="main"
+        path="/main.jsp"
         redirect="false"
       />
       <forward
-        name="loading"
-        path="/toolcontent/exportloading.jsp"
+        name="community"
+        path=".community"
         redirect="false"
       />
       <forward
-        name="result"
-        path="/toolcontent/exportresult.jsp"
+        name="profile"
+        path="/profile.do?method=view"
         redirect="false"
       />
-    </action>
-    <action
-      path="/portrait"
-      type="org.lamsfoundation.lams.web.PortraitAction"
-      name="PortraitActionForm"
-      scope="request"
-      unknown="false"
-      validate="false"
-    >
       <forward
-        name="portrait"
-        path=".portrait"
+        name="editprofile"
+        path="/profile.do?method=edit"
         redirect="false"
       />
-    </action>
-    <action
-      path="/profile"
-      type="org.lamsfoundation.lams.web.ProfileAction"
-      name="UserForm"
-      scope="request"
-      parameter="method"
-      unknown="false"
-      validate="false"
-    >
       <forward
-        name="view"
-        path=".profile"
+        name="password"
+        path="/password.do"
         redirect="false"
       />
       <forward
-        name="edit"
-        path=".editprofile"
+        name="passwordChanged"
+        path=".passwordChangeOk"
         redirect="false"
       />
+      <forward
+        name="portrait"
+        path="/portrait.do"
+        redirect="false"
+      />
+      <forward
+        name="content"
+        path="/indexContent.jsp"
+        redirect="false"
+      />
     </action>
     <action
-      path="/passwordChanged"
-      type="org.lamsfoundation.lams.web.PasswordChangeAction"
-      name="PasswordChangeActionForm"
+      path="/saveprofile"
+      type="org.lamsfoundation.lams.web.ProfileSaveAction"
+      name="UserForm"
       scope="request"
-      input=".passwordChange"
+      input=".editprofile"
       unknown="false"
       validate="false"
     >
       <forward
-        name="okay"
-        path="/index.do?state=active&amp;tab=passwordChanged"
-        redirect="false"
-      />
-      <forward
-        name="cancelled"
+        name="profile"
         path="/index.do?state=active&amp;tab=profile"
         redirect="false"
       />
       <forward
-        name="errors"
-        path="/index.do?state=active&amp;tab=password"
+        name="editprofile"
+        path="/index.do?state=active&amp;tab=editprofile"
         redirect="false"
       />
     </action>
@@ -323,65 +249,139 @@
       />
     </action>
     <action
-      path="/index"
-      type="org.lamsfoundation.lams.web.IndexAction"
+      path="/home"
+      type="org.lamsfoundation.lams.web.HomeAction"
+      parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="main"
-        path="/main.jsp"
+        name="sysadmin"
+        path="/sysadmin.jsp"
         redirect="false"
       />
       <forward
-        name="community"
-        path=".community"
+        name="learner"
+        path="/learner.jsp"
         redirect="false"
       />
       <forward
-        name="profile"
-        path="/profile.do?method=view"
+        name="author"
+        path="/author.jsp"
         redirect="false"
       />
       <forward
-        name="editprofile"
-        path="/profile.do?method=edit"
+        name="monitorLesson"
+        path="/monitorLesson.jsp"
         redirect="false"
       />
       <forward
-        name="password"
-        path="/password.do"
+        name="addLesson"
+        path="/addLesson.jsp"
         redirect="false"
       />
       <forward
-        name="passwordChanged"
-        path=".passwordChangeOk"
+        name="error"
+        path=".error"
         redirect="false"
       />
       <forward
-        name="portrait"
-        path="/portrait.do"
+        name="message"
+        path=".message"
         redirect="false"
       />
       <forward
-        name="content"
-        path="/indexContent.jsp"
+        name="passwordChange"
+        path=".passwordChange"
         redirect="false"
       />
+      <forward
+        name="index"
+        path="/index.jspp"
+        redirect="false"
+      />
     </action>
     <action
-      path="/workspace"
-      type="org.lamsfoundation.lams.workspace.web.WorkspaceAction"
+      path="/theme"
+      type="org.lamsfoundation.lams.themes.web.ThemeAction"
+      name="ThemeAction"
+      scope="request"
       parameter="method"
       unknown="false"
       validate="false"
     >
+    </action>
+    <action
+      path="/authoring/exportToolContent"
+      type="org.lamsfoundation.lams.authoring.web.ExportToolContentAction"
+      name="ExportAction"
+      scope="request"
+      unknown="false"
+      validate="false"
+    >
       <forward
-        name="success"
-        path="/index.jsp"
+        name="choice"
+        path="/toolcontent/exportchoice.jsp"
         redirect="false"
       />
+      <forward
+        name="loading"
+        path="/toolcontent/exportloading.jsp"
+        redirect="false"
+      />
+      <forward
+        name="result"
+        path="/toolcontent/exportresult.jsp"
+        redirect="false"
+      />
     </action>
+    <action
+      path="/authoring/author"
+      type="org.lamsfoundation.lams.authoring.web.AuthoringAction"
+      name="AuthoringAction"
+      scope="request"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
+    </action>
+    <action
+      path="/portrait"
+      type="org.lamsfoundation.lams.web.PortraitAction"
+      name="PortraitActionForm"
+      scope="request"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="portrait"
+        path=".portrait"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/launchlearner"
+      type="org.lamsfoundation.lams.web.LaunchLearnerAction"
+      parameter="mod"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="learner"
+        path="/launchlearner.jsp"
+        redirect="false"
+      />
+      <forward
+        name="error"
+        path=".error"
+        redirect="false"
+      />
+      <forward
+        name="message"
+        path=".message"
+        redirect="false"
+      />
+    </action>
 
     <!--  uncomment to use wddxPost   
  	<action