diff --git a/dba/caldav_functions.sql b/dba/caldav_functions.sql
index 5bd2f3a5..bcddb973 100644
--- a/dba/caldav_functions.sql
+++ b/dba/caldav_functions.sql
@@ -348,7 +348,6 @@ DECLARE
   change_user ALIAS FOR $2;
   key ALIAS FOR $3;
   value ALIAS FOR $4;
-  tmp_int INT;
 BEGIN
   -- Check that there is either a resource, collection or user at this location.
   IF NOT EXISTS(        SELECT 1 FROM caldav_data WHERE dav_name = path
@@ -358,11 +357,11 @@ BEGIN
                ) THEN
     RETURN FALSE;
   END IF;
-  SELECT changed_by INTO tmp_int FROM property WHERE dav_name = path AND property_name = key;
+  PERFORM true FROM property WHERE dav_name = path AND property_name = key;
   IF FOUND THEN
-    UPDATE property SET changed_by=change_user, changed_on=current_timestamp, property_value=value WHERE dav_name = path AND property_name = key;
+    UPDATE property SET changed_by=change_user::integer, 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, change_user, current_timestamp, key, value );
+    INSERT INTO property ( dav_name, changed_by, changed_on, property_name, property_value ) VALUES( path, change_user::integer, current_timestamp, key, value );
   END IF;
   RETURN TRUE;
 END;