I haven’t looked at your app, but one of the issues with the CID is that you need to manually add it for some types of JSF navigation.
There is code in PrettyFaces which is specifically designed to make sure that the CID, and other parameters added to redirect URLs, are preserved, but it sounds like there is something wrong with this.
@Christian, want help?
Do you play Magic?
Get TopDecked MTG, the #1 Magic App, built by players, for players. Free to use, forever.