Authorization: fix some issues in xhtml pages
conflict fixed