Bug fix from User refactoring