API bug with register and login
Merge branch 'brian'