Login box, some fixes