PR #1 - Improve AdminBusy a little