Fork of accounts-base including meteor/meteor#1845