Fix cross channel and user dialogue