add new default config and form reset link
Merge branch 'master' into integration