fix OAuth Echo in some cases