Fixed user and usergroup modules