Bug 1015313 - Last last bits needed for email -> userid migration