Fixed issues with the merge, swapped emaillogin an pwlogin in login.jsp