Fixed issues with category and user saving