new code login.js
merge code for login.js