generic credentials fixes