Fixed Login issues with modal