Revert a30a5ef..7f45f30

This rolls back to commit a30a5ef7e9db828ae6139fd3175975405f5a90df.
Revert "Revert a30a5ef..7f45f30"

This reverts commit 34ce5d0c9ee9e61a508391df763cb3c179b3976a.
Put Login & Register Back