More work on LoginFrame and Client