Improved the template to show only when pertinent.
Updated CMS_OAUTH_20_MODULE, to handle account_info, block