Improved login and removed resource