Fix login form
Resolve merge conflict