adapted user-form
no reload
Merge branch 'develop'