User managment hotfix