Username support + new login json format