[FIX] SSO Login + some related refactoring