turn back old user model; fix permission migration; some fixes