Hotfix/68 registrationhelp