YH-389: Fixed and checked user API