Fix for new login procedure