Ichabond login fixes got removed by accident, manually implemented them again