Some fixes in Users and Websites plugins