design qa changes for force userlogin modal
resolved merging conflict