Remove magic numbers from User