store: Make the old store form work on new store