Fix login bad req
MErge with master