Email activation process working

Change-Id: I72fa00ac98b69e15da0c3e9a6987864f22e5db49