Language fix
Registration fix
Merge branch 'hotfix/hotfix'