[Users] Upgrade from 3.1