Added respect for portal settings