User management improvement