@pratap.vardhan merging this before emailauth branch would be a pain since I forked this from that branch