Index: lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java
===================================================================
diff -u -rb72aa2c6f30c93631bc52d01258c8b2be200f233 -r273ac76ea166a02a1e72b10010ac41c545349bd5
--- lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java	(.../ImportService.java)	(revision b72aa2c6f30c93631bc52d01258c8b2be200f233)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java	(.../ImportService.java)	(revision 273ac76ea166a02a1e72b10010ac41c545349bd5)
@@ -253,7 +253,7 @@
 		    return null;
 		    
 		} else if (!ValidationUtil.isOrgNameValid(name)) {
-		    rowResult.add(messageService.getMessage("error.orgname.invalid.characters"));
+		    rowResult.add(messageService.getMessage("error.name.invalid.characters"));
 		    hasError = true;
 		    return null;
 		}
@@ -495,7 +495,7 @@
 	    return null;
 	    
 	} else if (!ValidationUtil.isUserNameValid(login)) {
-	    rowResult.add(messageService.getMessage("error.login.invalid.characters"));
+	    rowResult.add(messageService.getMessage("error.username.invalid.characters"));
 	    hasError = true;
 	    return null;
 	    
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerSaveAction.java
===================================================================
diff -u -rb72aa2c6f30c93631bc52d01258c8b2be200f233 -r273ac76ea166a02a1e72b10010ac41c545349bd5
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerSaveAction.java	(.../ServerSaveAction.java)	(revision b72aa2c6f30c93631bc52d01258c8b2be200f233)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerSaveAction.java	(.../ServerSaveAction.java)	(revision 273ac76ea166a02a1e72b10010ac41c545349bd5)
@@ -105,7 +105,7 @@
 			new ActionMessage("error.required", messageService.getMessage("sysadmin.organisation")));
 		
 	    } else if (!ValidationUtil.isOrgNameValid(orgName)) {
-		errors.add("orgId", new ActionMessage("error.orgname.invalid.characters"));
+		errors.add("orgId", new ActionMessage("error.name.invalid.characters"));
 		
 	    } else {
 		
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java
===================================================================
diff -u -rb72aa2c6f30c93631bc52d01258c8b2be200f233 -r273ac76ea166a02a1e72b10010ac41c545349bd5
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java	(.../UserSaveAction.java)	(revision b72aa2c6f30c93631bc52d01258c8b2be200f233)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java	(.../UserSaveAction.java)	(revision 273ac76ea166a02a1e72b10010ac41c545349bd5)
@@ -114,7 +114,7 @@
 	if (StringUtils.isBlank(login)) {
 	    errors.add("login", new ActionMessage("error.login.required"));
 	} else if (!ValidationUtil.isUserNameValid(login)) {
-	    errors.add("login", new ActionMessage("error.login.invalid.characters"));
+	    errors.add("login", new ActionMessage("error.username.invalid.characters"));
 	} else {
 	    userForm.set("login", login);
 	    User existingUser = UserSaveAction.service.getUserByLogin(login);