Fix main-card_form reset
Merge branch 'bug-fix'