User management fixes