Working on #436
Working on #436 - Setting to disable portal

Setting to disable portal