Initial refinements to login system...