Fixed bugs related to new user login HTML
Resolved merge conflicts