minor changes on mail-activation branch