Bugfixes for ICC: registration link not working properly