Index: lams_build/lib/lams/lams.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams.jar,v
diff -u -r1.420.2.17 -r1.420.2.18
Binary files differ
Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java,v
diff -u -r1.54.2.1 -r1.54.2.2
--- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	30 Sep 2014 13:11:24 -0000	1.54.2.1
+++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	2 Feb 2015 15:30:34 -0000	1.54.2.2
@@ -105,8 +105,7 @@
 	    User user = getUserManagementService().getUserByLogin(userDTO.getLogin());
 	    user.setFirstLogin(false);
 	    getUserManagementService().save(user);
-	    ss.removeAttribute(AttributeNames.USER);
-	    ss.setAttribute(AttributeNames.USER, user.getUserDTO());
+	    userDTO.setFirstLogin(false);
 	}
 
 	// check if user is flagged as needing to change their password
Index: lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java,v
diff -u -r1.18 -r1.18.2.1
--- lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java	8 Apr 2014 15:27:08 -0000	1.18
+++ lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java	2 Feb 2015 15:30:34 -0000	1.18.2.1
@@ -157,7 +157,6 @@
 
 	// replace UserDTO in the shared session
 	HttpSession ss = SessionManager.getSession();
-	ss.removeAttribute(AttributeNames.USER);
 	ss.setAttribute(AttributeNames.USER, requestor.getUserDTO());
 
 	return mapping.findForward("profile");
Index: lams_central/src/java/org/lamsfoundation/lams/web/TutorialAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/TutorialAction.java,v
diff -u -r1.2 -r1.2.4.1
--- lams_central/src/java/org/lamsfoundation/lams/web/TutorialAction.java	6 Jul 2009 11:04:28 -0000	1.2
+++ lams_central/src/java/org/lamsfoundation/lams/web/TutorialAction.java	2 Feb 2015 15:30:34 -0000	1.2.4.1
@@ -75,7 +75,6 @@
 	user.getPagesWithDisabledTutorials().add(pageString);
 	getService().save(user);
 
-	ss.removeAttribute(AttributeNames.USER);
 	ss.setAttribute(AttributeNames.USER, user.getUserDTO());
 
 	return null;
@@ -102,7 +101,6 @@
 	user.getPagesWithDisabledTutorials().remove(pageString);
 	getService().save(user);
 
-	ss.removeAttribute(AttributeNames.USER);
 	ss.setAttribute(AttributeNames.USER, user.getUserDTO());
 
 	return null;
@@ -156,7 +154,6 @@
 	user.setTutorialsDisabled(true);
 	getService().save(user);
 
-	ss.removeAttribute(AttributeNames.USER);
 	ss.setAttribute(AttributeNames.USER, user.getUserDTO());
 
 	return null;
Index: lams_central/src/java/org/lamsfoundation/lams/web/lamscommunity/LamsCommunityLoginAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/lamscommunity/LamsCommunityLoginAction.java,v
diff -u -r1.3 -r1.3.4.1
--- lams_central/src/java/org/lamsfoundation/lams/web/lamscommunity/LamsCommunityLoginAction.java	2 Jul 2009 09:54:56 -0000	1.3
+++ lams_central/src/java/org/lamsfoundation/lams/web/lamscommunity/LamsCommunityLoginAction.java	2 Feb 2015 15:30:34 -0000	1.3.4.1
@@ -254,8 +254,6 @@
 	// Update the user session, set the logged into lamscommunity flag
 	UserDTO userDTO = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
 	userDTO.setLoggedIntoLamsCommunity(true);
-	HttpSession sharedsession = SessionManager.getSession();
-	sharedsession.setAttribute(AttributeNames.USER, userDTO);
 	
 	String timestamp = "" + new Date().getTime();
 	String hash = LamsCommunityUtil.createAuthenticationHash(timestamp, user.getLamsCommunityUsername(), user.getLamsCommunityToken(), serverID, serverKey);
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java,v
diff -u -r1.23.2.1 -r1.23.2.2
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java	18 Nov 2014 16:21:03 -0000	1.23.2.1
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java	2 Feb 2015 15:30:36 -0000	1.23.2.2
@@ -33,10 +33,10 @@
 /**
  * @author Manpreet Minhas
  */
-public class UserDTO implements Serializable{
+public class UserDTO implements Serializable {
 
     private static final long serialVersionUID = 5299784226270953691L;
-    
+
     private Integer userID;
     private String firstName;
     private String lastName;
@@ -237,4 +237,7 @@
 	return firstLogin;
     }
 
-}
+    public void setFirstLogin(Boolean firstLogin) {
+	this.firstLogin = firstLogin;
+    }
+}
\ No newline at end of file
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java,v
diff -u -r1.61.2.1 -r1.61.2.2
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java	12 Sep 2014 22:43:47 -0000	1.61.2.1
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java	2 Feb 2015 15:30:32 -0000	1.61.2.2
@@ -67,7 +67,6 @@
 	request.getSession().removeAttribute(MAP_QUESTIONS_CONTENT);
 	request.getSession().removeAttribute(IS_REMOVE_CONTENT);
 	request.getSession().removeAttribute(IS_REVISITING_USER);
-	request.getSession().removeAttribute(USER);
 	request.getSession().removeAttribute(TOOL_CONTENT_UID);
 	request.getSession().removeAttribute(TOOL_SESSION_ID);
 	request.getSession().removeAttribute(USER_ID);