Move the check for whether the account has certs yet or not to where it's actually useful