Should have proper password exclusion working now