Fixing up HomePanel and LoginClient