User API fixes