Download the file instead of showing it + small bugfix in users