Fix for expired logins