Hotfix new user