Fixed multiple ADAL popups and did subscription fit and finish (2132659)