Retain original filename before applying the filename generator

This pull request allows the retention the original filename of an uploaded file before applying the filename generator :)