No worries, @davehunt or @zacc  had a comment on my previous pull request.
I think you should file a bug in bugzilla.

As for me, I think you might be able to get all #account-delete-ok and detect if it is enabled as for now?
But, your temp way works fine.