User management improvements