(partially?) fix a login showstopper