Fixed the user entity