Remove merge mess
Fix minor error in login form