Making LoginWindow work with new collection method format