User entity CRUD / fix