Integration - Registration hotfix