Improved login feature