More behavior for church/register bug