Additional changes to allow rebuild menu on first login