Fix in User Class