made elegant fails for login
Merge branch 'requests'
fixed login.js
fixing merge conflicts