diff --git a/mayan/apps/metadata/forms.py b/mayan/apps/metadata/forms.py
index 36d24eace7..5313f3bddd 100644
--- a/mayan/apps/metadata/forms.py
+++ b/mayan/apps/metadata/forms.py
@@ -71,7 +71,7 @@ class AddMetadataForm(forms.Form):
     def __init__(self, *args, **kwargs):
         document_type = kwargs.pop('document_type')
         super(AddMetadataForm, self).__init__(*args, **kwargs)
-        self.fields['metadata_type'].queryset = document_type.metadata_type.all()
+        self.fields['metadata_type'].queryset = document_type.metadata.all()
 
     metadata_type = forms.ModelChoiceField(queryset=MetadataType.objects.all(), label=_(u'Metadata type'))
 
diff --git a/mayan/apps/metadata/views.py b/mayan/apps/metadata/views.py
index 3617803b28..884b7f80c3 100644
--- a/mayan/apps/metadata/views.py
+++ b/mayan/apps/metadata/views.py
@@ -75,7 +75,7 @@ def metadata_edit(request, document_id=None, document_id_list=None):
         initial.append({
             'metadata_type': key,
             'value': u', '.join(value) if value else '',
-            'required': key in document.document_type.metadata_type.filter(required=True),
+            'required': key in document.document_type.metadata.filter(required=True),
         })
 
     formset = MetadataFormSet(initial=initial)