Fix registration to change view after completion