Even more login requirement fixes... sorry