Abuse prevention enhancement