Registration data is stored twice

Need to move data save to on_enter