Comment 3 for bug 1254146

Replicated the bug on a fresh system (ours already had a deactivated opac entry with org units, so we couldn't test the original bug there). Works to resolve the issue.

Picked to master, rel_2_5, rel_2_4, and rel_2_3. Thanks Bill!