Restore masterJID generation