Fix #12. Also change user login to use Username and fix bug with redirecting after logout