diff --git a/dba/caldav_functions.sql b/dba/caldav_functions.sql
index 647c484e..8f6be8d1 100644
--- a/dba/caldav_functions.sql
+++ b/dba/caldav_functions.sql
@@ -345,7 +345,7 @@ $$ LANGUAGE 'sql' IMMUTABLE STRICT;
 CREATE or REPLACE FUNCTION set_dav_property( TEXT, INTEGER, TEXT, TEXT ) RETURNS BOOLEAN AS $$
 DECLARE
   path ALIAS FOR $1;
-  user ALIAS FOR $2;
+  change_user ALIAS FOR $2;
   key ALIAS FOR $3;
   value ALIAS FOR $4;
   tmp_int INT;
@@ -360,9 +360,9 @@ BEGIN
   END IF;
   SELECT changed_by INTO tmp_int FROM property WHERE dav_name = path AND property_name = key;
   IF FOUND THEN
-    UPDATE property SET changed_by=user, changed_on=current_timestamp, property_value=value WHERE dav_name = path AND property_name = key;
+    UPDATE property SET changed_by=change_user, changed_on=current_timestamp, property_value=value WHERE dav_name = path AND property_name = key;
   ELSE
-    INSERT INTO property ( dav_name, changed_by, changed_on, property_name, property_value ) VALUES( path, user, current_timestamp, key, value );
+    INSERT INTO property ( dav_name, changed_by, changed_on, property_name, property_value ) VALUES( path, change_user, current_timestamp, key, value );
   END IF;
   RETURN TRUE;
 END;