diff --git a/apps/documents/conf/settings.py b/apps/documents/conf/settings.py
index a09911fd8a..6554e02f4d 100644
--- a/apps/documents/conf/settings.py
+++ b/apps/documents/conf/settings.py
@@ -8,8 +8,8 @@ default_available_functions = {
 }
 
 AVAILABLE_FUNCTIONS = getattr(settings, 'DOCUMENTS_METADATA_AVAILABLE_FUNCTIONS', default_available_functions)
-STAGING_DIRECTORY = getattr(settings, 'DOCUMENTS_STAGING_DIRECTORY', '/tmp')
-FILESERVING_PATH = getattr(settings, 'DOCUMENTS_FILESERVING_PATH', '/tmp')
+STAGING_DIRECTORY = getattr(settings, 'DOCUMENTS_STAGING_DIRECTORY', u'/tmp')
+FILESERVING_PATH = getattr(settings, 'DOCUMENTS_FILESERVING_PATH', u'/tmp')
 DELETE_ORIGINAL = getattr(settings, 'DOCUMENTS_DELETE_ORIGINAL', False)
 SLUGIFY_PATH = getattr(settings, 'DOCUMENTS_SLUGIFY_PATH', False)
 CHECKSUM_FUNCTION = getattr(settings, 'DOCUMENTS_CHECKSUM_FUNCTION', lambda x: hashlib.sha256(x).hexdigest())
diff --git a/apps/documents/forms.py b/apps/documents/forms.py
index 6321335a88..1c22dfe4f2 100644
--- a/apps/documents/forms.py
+++ b/apps/documents/forms.py
@@ -20,9 +20,10 @@ class DocumentForm(forms.ModelForm):
         if 'initial' in kwargs:
             if 'document_type' in kwargs['initial']:
                 self.fields['document_type'].widget = forms.HiddenInput()
-                if kwargs['initial']['document_type'].documenttypefilename_set.all().count() > 0:
+                filenames_qs = kwargs['initial']['document_type'].documenttypefilename_set.filter(enabled=True)
+                if filenames_qs.count() > 0:
                     self.fields['new_filename'] = forms.ModelChoiceField(
-                        queryset=kwargs['initial']['document_type'].documenttypefilename_set.all(),
+                        queryset=filenames_qs,
                         required=False,
                         label=_(u'Rename file'))
 
diff --git a/apps/documents/models.py b/apps/documents/models.py
index 47d85032d8..e13e7aa304 100644
--- a/apps/documents/models.py
+++ b/apps/documents/models.py
@@ -146,12 +146,14 @@ class DocumentMetadata(models.Model):
 
 class DocumentTypeFilename(models.Model):
     document_type = models.ForeignKey(DocumentType, verbose_name=_(u'document type'))
-    filename = models.CharField(max_length=64, verbose_name=_('filename'))
+    filename = models.CharField(max_length=64, verbose_name=_(u'filename'))
+    enabled = models.BooleanField(default=True, verbose_name=_(u'enabled'))
     
     def __unicode__(self):
         return self.filename
 
     class Meta:
+        ordering = ['filename']
         verbose_name = _(u'document type filename')
         verbose_name_plural = _(u'document types filenames')