Revert c199614..d93aef0

This rolls back to commit c19961450c214e4751cdee03d18c5e0e2d799d3b.
Fixed server bugs

login was not working