SOS-1402
Test Fixes - portal/controlpanel/users
Test Fixes - portal/controlpanel/users