More work on Login dialogue