Updated - continued implementation of activate user