Couple fixes and additions

Our org has more than 1 page of nicks and a self-hosted installation so added support for those two things.

If you are interested.