improved login again