Move the check behind the jid check