diff --git a/entity/Organisation_entity/entityfields/attributes/onValidation.js b/entity/Organisation_entity/entityfields/attributes/onValidation.js
index 508c2b5e9491f486c6c9ceb574b1b951dd5acc62..7fd206a2b41c15ada50e1cee5d0468e6e8f4607f 100644
--- a/entity/Organisation_entity/entityfields/attributes/onValidation.js
+++ b/entity/Organisation_entity/entityfields/attributes/onValidation.js
@@ -3,4 +3,4 @@ import("system.vars");
 import("Attribute_lib");
 import("system.result");
 
-result.string(AttributeRelationUtils.validateAttributeCount(vars.get("$sys.uid"), ContextUtils.getCurrentContextId(), "Attributes"));
\ No newline at end of file
+result.string(AttributeRelationUtils.validateAttributeCount(vars.get("$field.CONTACTID"), ContextUtils.getCurrentContextId(), "Attributes"));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/attributes/onValidation.js b/entity/Person_entity/entityfields/attributes/onValidation.js
index 508c2b5e9491f486c6c9ceb574b1b951dd5acc62..7fd206a2b41c15ada50e1cee5d0468e6e8f4607f 100644
--- a/entity/Person_entity/entityfields/attributes/onValidation.js
+++ b/entity/Person_entity/entityfields/attributes/onValidation.js
@@ -3,4 +3,4 @@ import("system.vars");
 import("Attribute_lib");
 import("system.result");
 
-result.string(AttributeRelationUtils.validateAttributeCount(vars.get("$sys.uid"), ContextUtils.getCurrentContextId(), "Attributes"));
\ No newline at end of file
+result.string(AttributeRelationUtils.validateAttributeCount(vars.get("$field.CONTACTID"), ContextUtils.getCurrentContextId(), "Attributes"));
\ No newline at end of file