Minor fixes on mail-activation