Reverting back reverted change to login
Merge branch 'master' of https://github.com/melsol/WebFolder