Also update from refactor in login.hpp