Made a few minor changes in user
Made a few minor changs in UserAPI