#311 - tweak configuration for enterprise support