[WIP] The fixes needed before I could continue with login-box