diff --git a/entity/Person_entity/recordcontainers/db/onDBUpdate.js b/entity/Person_entity/recordcontainers/db/onDBUpdate.js
index 558fad5fb32a15ce823e8c00899b7b5cdf9eb622..8c54172f7f22d1b685061f422c173f2b48249441 100644
--- a/entity/Person_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Person_entity/recordcontainers/db/onDBUpdate.js
@@ -1,3 +1,4 @@
+import("system.tools");
 import("system.vars");
 import("Person_lib");
 import("Communication_lib");
@@ -15,4 +16,19 @@ FieldChanges.assimilateChangeAndDispose("$field.STANDARD_PHONE_COMMUNICATION", f
 });
 
 new StandardObject("Address", vars.get("$field.ADDRESS_ID"), "Person", vars.get("$field.CONTACTID"))
-    .onPersonUpdate(vars.get("$field.ORGANISATION_ID"));
\ No newline at end of file
+    .onPersonUpdate(vars.get("$field.ORGANISATION_ID"));
+
+var updates = [];
+    
+// update user object if name changed
+vars.get("$local.changed").forEach(function(fieldName) {
+    switch (fieldName) {
+        case "PERSON.FIRSTNAME":
+        case "PERSON.LASTNAME":
+            var user = tools.getUserByAttribute(tools.CONTACTID, [vars.get("$field.CONTACTID")], tools.PROFILE_FULL);
+            user[tools.PARAMS][tools.FIRSTNAME] = vars.get("$field.FIRSTNAME");
+            user[tools.PARAMS][tools.LASTNAME] = vars.get("$field.LASTNAME");
+            tools.updateUser(user);
+            break;
+    }
+})
\ No newline at end of file