Fixed up login and register
Revert "Fixed up login and register"

This reverts commit 9f246b9f7b71804e474b4284fd84e4080e85bb64.
Merge remote-tracking branch 'origin/master'