add login support - clean up