Fix data_bags + users issue