Index: lams_central/src/java/org/lamsfoundation/lams/web/ProfileController.java
===================================================================
diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -r0c4dd9644dcb13ab9edcdd354f6f28945a09684a
--- lams_central/src/java/org/lamsfoundation/lams/web/ProfileController.java	(.../ProfileController.java)	(revision f2ad75cef0c507a64877942631fee13efbc6ed50)
+++ lams_central/src/java/org/lamsfoundation/lams/web/ProfileController.java	(.../ProfileController.java)	(revision 0c4dd9644dcb13ab9edcdd354f6f28945a09684a)
@@ -95,7 +95,6 @@
 
     @RequestMapping("/view")
     public String view(HttpServletRequest request) throws Exception {
-
 	User requestor = userManagementService.getUserByLogin(request.getRemoteUser());
 	String fullName = (requestor.getTitle() != null ? requestor.getTitle() + " " : "") + requestor.getFirstName()
 		+ " " + requestor.getLastName();
@@ -281,5 +280,4 @@
 
 	return "profile/editprofile";
     }
-
 }
Index: lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveController.java
===================================================================
diff -u -r43bf12a36195acd5fa20bb275ced93b8e0a0aecc -r0c4dd9644dcb13ab9edcdd354f6f28945a09684a
--- lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveController.java	(.../ProfileSaveController.java)	(revision 43bf12a36195acd5fa20bb275ced93b8e0a0aecc)
+++ lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveController.java	(.../ProfileSaveController.java)	(revision 0c4dd9644dcb13ab9edcdd354f6f28945a09684a)
@@ -74,17 +74,6 @@
 
 	request.setAttribute("submitted", true);
 
-	User requestor = userManagementService.getUserByLogin(request.getRemoteUser());
-
-	// check requestor is same as user being edited
-	if (!requestor.getLogin().equals(userForm.getLogin())) {
-	    ProfileSaveController.log
-		    .warn(requestor.getLogin() + " tried to edit profile of user " + userForm.getLogin());
-	    errorMap.add("GLOBAL", messageService.getMessage("error.authorisation"));
-	    request.setAttribute("errorMap", errorMap);
-	    return "forward:/profile/edit.do";
-	}
-
 	// (dyna)form validation
 	//first name validation
 	String firstName = (userForm.getFirstName() == null) ? null : (String) userForm.getFirstName();
@@ -123,6 +112,7 @@
 	    return "forward:/profile/edit.do";
 	}
 
+	User requestor = userManagementService.getUserByLogin(request.getRemoteUser());
 	if (!Configuration.getAsBoolean(ConfigurationKeys.PROFILE_EDIT_ENABLE)
 		&& Configuration.getAsBoolean(ConfigurationKeys.PROFILE_PARTIAL_EDIT_ENABLE)) {
 	    // update only contact fields
@@ -144,7 +134,6 @@
 	    Theme cssTheme = (Theme) userManagementService.findById(Theme.class, userForm.getUserTheme());
 	    requestor.setTheme(cssTheme);
 	}
-
 	userManagementService.saveUser(requestor);
 
 	// replace UserDTO in the shared session
@@ -153,5 +142,4 @@
 
 	return "forward:/profile/view.do";
     }
-
 }
Index: lams_central/src/java/org/lamsfoundation/lams/web/UserForm.java
===================================================================
diff -u -r792f30e164500b758d9eeac2dcf19853be4dfd9f -r0c4dd9644dcb13ab9edcdd354f6f28945a09684a
--- lams_central/src/java/org/lamsfoundation/lams/web/UserForm.java	(.../UserForm.java)	(revision 792f30e164500b758d9eeac2dcf19853be4dfd9f)
+++ lams_central/src/java/org/lamsfoundation/lams/web/UserForm.java	(.../UserForm.java)	(revision 0c4dd9644dcb13ab9edcdd354f6f28945a09684a)
@@ -2,9 +2,6 @@
 
 public class UserForm {
 
-    private Integer userId;
-    private String login;
-    private String password;
     private String title;
     private String firstName;
     private String lastName;
@@ -24,24 +21,7 @@
     private String timeZone;
     private Boolean tutorialsDisabled;
     private Long userTheme;
-    public Integer getUserId() {
-        return userId;
-    }
-    public void setUserId(Integer userId) {
-        this.userId = userId;
-    }
-    public String getLogin() {
-        return login;
-    }
-    public void setLogin(String login) {
-        this.login = login;
-    }
-    public String getPassword() {
-        return password;
-    }
-    public void setPassword(String password) {
-        this.password = password;
-    }
+
     public String getTitle() {
         return title;
     }
@@ -156,6 +136,4 @@
     public void setUserTheme(Long userTheme) {
         this.userTheme = userTheme;
     }
-    
-    
 }
Index: lams_central/web/profile/editprofile.jsp
===================================================================
diff -u -r43bf12a36195acd5fa20bb275ced93b8e0a0aecc -r0c4dd9644dcb13ab9edcdd354f6f28945a09684a
--- lams_central/web/profile/editprofile.jsp	(.../editprofile.jsp)	(revision 43bf12a36195acd5fa20bb275ced93b8e0a0aecc)
+++ lams_central/web/profile/editprofile.jsp	(.../editprofile.jsp)	(revision 0c4dd9644dcb13ab9edcdd354f6f28945a09684a)
@@ -11,9 +11,7 @@
 <c:set var="lams"><lams:LAMSURL/></c:set>
 <c:set var="profileEditEnabled"><%=Configuration.get(ConfigurationKeys.PROFILE_EDIT_ENABLE)%></c:set>
 <c:set var="partialProfileEditEnabled"><%=Configuration.get(ConfigurationKeys.PROFILE_PARTIAL_EDIT_ENABLE)%></c:set>
-<c:set var="authenticationMethodId">
-	<lams:user property="authenticationMethodId" />
-</c:set>
+<c:set var="authenticationMethodId"><lams:user property="authenticationMethodId" /></c:set>
 <c:set var="dbId"><%=AuthenticationMethod.DB%></c:set>
 <%-- This gets overwritten for a client during build process (SP-3) --%>
 <c:set var="editOnlyName" value="false" />
@@ -47,9 +45,6 @@
 
 <body>
 	<form:form action="/lams/saveprofile.do" modelAttribute='newForm' method="post" id='newForm'>
-		<form:hidden path="userId" />
-		<form:hidden path="login" />
-		<form:hidden path="password" />
 		<input type="hidden" name="editNameOnly" value="${editOnlyName}" />
 
 		<lams:errors path="*"/>
@@ -68,7 +63,7 @@
 										<label>
 											<fmt:message key="label.username" />
 										</label>: 
-										${newForm.login}
+										<lams:user property="login" />
 									</span>
 								</div>
 								
@@ -225,22 +220,11 @@
 								<form:hidden path="fax" />
 
 								<div class="form-group">
-									<label><fmt:message key="label.username" /></label> <input
-										type="text" class="form-control"
-										value="${UserForm.login}">
+									<label><fmt:message key="label.username" /></label> 
+									<lams:user property="login" />
 								</div>
 
 								<div class="form-group">
-									<label><fmt:message key="label.username" /></label> <input
-										type="text" class="form-control"
-										value="${UserForm.login}" />
-								</div>
-								<div class="form-group">
-									<label><fmt:message key="label.title" />:</label> <input
-										type="text" class="form-control"
-										value="${UserForm.title}"/>
-								</div>
-								<div class="form-group">
 									<label><fmt:message key="label.first_name" /> *:</label> <input
 										type="text" class="form-control"
 										value="${UserForm.firstName}"/>
@@ -361,6 +345,8 @@
 					</div>
 				</div>
 			</div>
+		</div>
+			
 		<div class="form-group" align="right">
 			<button type="button" class="btn btn-sm btn-default voffset5" onclick="history.go(-1);">
 				<fmt:message key="button.cancel" />