Fixed User ORM problems