CSPACE-6273: Consolidate env variable management back with user account management.