[WIP] Improve authentication process for v2.2.0