Fix User after refactoring