diff --git a/session8/project-template/shopping-cart-application/web/src/main/java/org/solent/com504/oodd/cart/spring/web/UserAndLoginController.java b/session8/project-template/shopping-cart-application/web/src/main/java/org/solent/com504/oodd/cart/spring/web/UserAndLoginController.java
index 4668de822..3b288d333 100644
--- a/session8/project-template/shopping-cart-application/web/src/main/java/org/solent/com504/oodd/cart/spring/web/UserAndLoginController.java
+++ b/session8/project-template/shopping-cart-application/web/src/main/java/org/solent/com504/oodd/cart/spring/web/UserAndLoginController.java
@@ -220,6 +220,7 @@ public String users(Model model,
 
         List<User> userList = userRepository.findAll();
 
+        model.addAttribute("user", sessionUser);
         model.addAttribute("userListSize", userList.size());
         model.addAttribute("userList", userList);
         model.addAttribute("selectedPage", "users");
@@ -259,8 +260,9 @@ public String modifyuser(
                 return ("home");
             }
         }
-        User user = userList.get(0);
-        model.addAttribute("user", user);
+        User modifyUser = userList.get(0);
+        model.addAttribute("user", sessionUser);
+        model.addAttribute("modifyUser", modifyUser);
         model.addAttribute("message", message);
         model.addAttribute("errorMessage", errorMessage);
         return "viewModifyUser";
diff --git a/session8/project-template/shopping-cart-application/web/src/main/webapp/WEB-INF/view/viewModifyUser.jsp b/session8/project-template/shopping-cart-application/web/src/main/webapp/WEB-INF/view/viewModifyUser.jsp
index 4ad0b5878..a5483d4a0 100644
--- a/session8/project-template/shopping-cart-application/web/src/main/webapp/WEB-INF/view/viewModifyUser.jsp
+++ b/session8/project-template/shopping-cart-application/web/src/main/webapp/WEB-INF/view/viewModifyUser.jsp
@@ -27,55 +27,55 @@
                 <tbody>
                     <tr>
                         <td>User ID</td>
-                        <td>${user.id}</td>
+                        <td>${modifyUser.id}</td>
                     </tr>
                     <tr>
                         <td>username</td>
-                        <td>${user.username}</td>
+                        <td>${modifyUser.username}</td>
                     </tr>
                     <tr>
                         <td>First Name</td>
-                        <td><input type="text" name="firstName" value="${user.firstName}" /></td>
+                        <td><input type="text" name="firstName" value="${modifyUser.firstName}" /></td>
                     </tr>
                     <tr>
                         <td>Second Name</td>
-                        <td><input type="text" name="secondName" value="${user.secondName}" /></td>
+                        <td><input type="text" name="secondName" value="${modifyUser.secondName}" /></td>
                     </tr>
                     <tr>
                         <td>House Number</td>
-                        <td><input type="text" name="houseNumber" value="${user.address.houseNumber}" /></td>
+                        <td><input type="text" name="houseNumber" value="${modifyUser.address.houseNumber}" /></td>
                     </tr>
                     <tr>
                         <td>Address Line 1</td>
-                        <td><input type="text" name="addressLine1" value="${user.address.addressLine1}" /></td>
+                        <td><input type="text" name="addressLine1" value="${modifyUser.address.addressLine1}" /></td>
                     </tr>
                     <tr>
                         <td>Address Line 2</td>
-                        <td><input type="text" name="addressLine2" value="${user.address.addressLine2}" /></td>
+                        <td><input type="text" name="addressLine2" value="${modifyUser.address.addressLine2}" /></td>
                     </tr>
                     <tr>
                         <td>city</td>
-                        <td><input type="text" name="county" value="${user.address.city}" /></td>
+                        <td><input type="text" name="county" value="${modifyUser.address.city}" /></td>
                     </tr>
                     <tr>
                         <td>county</td>
-                        <td><input type="text" name="county" value="${user.address.county}" /></td>
+                        <td><input type="text" name="county" value="${modifyUser.address.county}" /></td>
                     </tr>
                     <tr>
                         <td>country</td>
-                        <td><input type="text" name="country" value="${user.address.country}" /></td>
+                        <td><input type="text" name="country" value="${modifyUser.address.country}" /></td>
                     </tr>
                     <tr>
                         <td>postcode</td>
-                        <td><input type="text" name="postcode" value="${user.address.postcode}" /></td>
+                        <td><input type="text" name="postcode" value="${modifyUser.address.postcode}" /></td>
                     </tr>
                     <tr>
                         <td>telephone</td>
-                        <td><input type="text" name="telephone" value="${user.address.telephone}" /></td>
+                        <td><input type="text" name="telephone" value="${modifyUser.address.telephone}" /></td>
                     </tr>
                     <tr>
                         <td>mobile</td>
-                        <td><input type="text" name="mobile" value="${user.address.mobile}" /></td>
+                        <td><input type="text" name="mobile" value="${modifyUser.address.mobile}" /></td>
                     </tr>
 
                 </tbody>
@@ -90,11 +90,11 @@
                     <tbody>
                         <tr>
                             <td>Role</td>
-                            <td>${user.userRole}</td>
+                            <td>${modifyUser.userRole}</td>
                         </tr>
                         <tr>
                             <td>enabled</td>
-                            <td><c:if test="${user.enabled}">ENABLED</c:if><c:if test="${!user.enabled}">DISABLED</c:if></td>
+                            <td><c:if test="${modifyUser.enabled}">ENABLED</c:if><c:if test="${!modifyUser.enabled}">DISABLED</c:if></td>
                             </tr>
                         </tbody>
                     </table>
@@ -111,7 +111,7 @@
                             <td>
                                 <select class="form-control" name="userRole" >
                                     <c:forEach var="value" items="${UserRole.values()}">
-                                        <option value="${value}" <c:if test="${user.userRole == value}"> selected  </c:if>>${value}</option>
+                                        <option value="${value}" <c:if test="${modifyUser.userRole == value}"> selected  </c:if>>${value}</option>
                                     </c:forEach>
                                 </select>
                             </td>
@@ -120,8 +120,8 @@
                             <td>enabled</td>
                             <td>
                                 <select class="form-control" name="userEnabled" >
-                                    <option value="true" <c:if test="${user.enabled}"> selected  </c:if> >ENABLED</option>
-                                    <option value="false" <c:if test="${!user.enabled}"> selected  </c:if> >DISABLED</option>
+                                    <option value="true" <c:if test="${modifyUser.enabled}"> selected  </c:if> >ENABLED</option>
+                                    <option value="false" <c:if test="${!modifyUser.enabled}"> selected  </c:if> >DISABLED</option>
                                     </select>
                                 </td>
                             </tr>
@@ -129,16 +129,16 @@
                     </table>
             </c:if>
 
-            <input type="hidden" name="username" value="${user.username}"/>
-            <button class="btn" type="submit" >Update User ${user.username}</button>
+            <input type="hidden" name="username" value="${modifyUser.username}"/>
+            <button class="btn" type="submit" >Update User ${modifyUser.username}</button>
         </form>
         <p>Update Password</p>
         <form action="./viewModifyUser" method="post">
-            <input type="hidden" name="username" value="${user.username}"/>
+            <input type="hidden" name="username" value="${modifyUser.username}"/>
             <input type="hidden" name="action" value="updatePassword"/>
             <p>Password <input type="password" name="password" ></input></p>
             <p>Re Enter Password <input type="password" name="password2" ></input></p>
-            <button class="btn" type="submit" >Update ${user.username} Password</button>
+            <button class="btn" type="submit" >Update ${modifyUser.username} Password</button>
         </form>
         <c:if test="${user.userRole =='ADMINISTRATOR'}">
             <BR>