User activation final fixes

thi is not even my final form
Idem come sopra.