Login and credentials fixes
Filter preparation