fixes upload and prevent doubleclick
Merge pull request #2145 from robertmuehsig/430-upload

fixes upload and prevent doubleclick for #430