Fix added_by bug (there might not be a User id = 1)