Fix login auth
Merge