Fix up password enforcement code