I don't think we still need this with PW-logins disabled