CS and WS on pages updated to use config setting for account login