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