fix badmatch on remove_user on PEP nodes (EJAB-1649)