Small changes, added return ID on create User