Fix/portal instantiate on email activation

Review please for the next 4.2.2