fixed login.js
fixing merge conflicts