minor fixes to login-dialog
manual merge