Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -rf9b23e848885c277bcc9de377b94ae3884ce7a6d -r4ec3dc2b1fbb913b43418958d45d5eb34842e933
Binary files differ
Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
===================================================================
diff -u -r1d2ff22c947ab0d5646bb02b8189ca668020bdbc -r4ec3dc2b1fbb913b43418958d45d5eb34842e933
--- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	(.../IndexAction.java)	(revision 1d2ff22c947ab0d5646bb02b8189ca668020bdbc)
+++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	(.../IndexAction.java)	(revision 4ec3dc2b1fbb913b43418958d45d5eb34842e933)
@@ -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
===================================================================
diff -u -r0d275bf753620ae71aeb4e7589c540c9777532cb -r4ec3dc2b1fbb913b43418958d45d5eb34842e933
--- lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java	(.../ProfileSaveAction.java)	(revision 0d275bf753620ae71aeb4e7589c540c9777532cb)
+++ lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java	(.../ProfileSaveAction.java)	(revision 4ec3dc2b1fbb913b43418958d45d5eb34842e933)
@@ -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
===================================================================
diff -u -r2f5473044ec01bd94a2ea8e5262b2a200f1e6da6 -r4ec3dc2b1fbb913b43418958d45d5eb34842e933
--- lams_central/src/java/org/lamsfoundation/lams/web/TutorialAction.java	(.../TutorialAction.java)	(revision 2f5473044ec01bd94a2ea8e5262b2a200f1e6da6)
+++ lams_central/src/java/org/lamsfoundation/lams/web/TutorialAction.java	(.../TutorialAction.java)	(revision 4ec3dc2b1fbb913b43418958d45d5eb34842e933)
@@ -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
===================================================================
diff -u -rdaf00a52f630e4b979227c958b7d1e70e0a9b466 -r4ec3dc2b1fbb913b43418958d45d5eb34842e933
--- lams_central/src/java/org/lamsfoundation/lams/web/lamscommunity/LamsCommunityLoginAction.java	(.../LamsCommunityLoginAction.java)	(revision daf00a52f630e4b979227c958b7d1e70e0a9b466)
+++ lams_central/src/java/org/lamsfoundation/lams/web/lamscommunity/LamsCommunityLoginAction.java	(.../LamsCommunityLoginAction.java)	(revision 4ec3dc2b1fbb913b43418958d45d5eb34842e933)
@@ -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
===================================================================
diff -u -r0c0cbdac26679e47d5c48e045c30e5496e1f809b -r4ec3dc2b1fbb913b43418958d45d5eb34842e933
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java	(.../UserDTO.java)	(revision 0c0cbdac26679e47d5c48e045c30e5496e1f809b)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java	(.../UserDTO.java)	(revision 4ec3dc2b1fbb913b43418958d45d5eb34842e933)
@@ -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
===================================================================
diff -u -r1a02559e19419af9991eaeb9363f809355b39bc7 -r4ec3dc2b1fbb913b43418958d45d5eb34842e933
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java	(.../McUtils.java)	(revision 1a02559e19419af9991eaeb9363f809355b39bc7)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java	(.../McUtils.java)	(revision 4ec3dc2b1fbb913b43418958d45d5eb34842e933)
@@ -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);