WH-38 - Add user functionality. Minor bugfix on avatar handling, when re-POST the form with 'File Upload' type checked and without adding file.