SSO - motorolasolutions code tweaks