Fixed Login again

- Fixed Login
- Continued work (exam time done)