Fixed issues with on behalf of and mhtmltag