Migration and UserMixin fix