MDL-35875 - User - Fixing overflow issues