Upgrade to OAuth2 for better end user experience