update login form, add forgot password
merge