diff --git a/passbook/providers/saml/forms.py b/passbook/providers/saml/forms.py
index 3a5dd8904..4c780d511 100644
--- a/passbook/providers/saml/forms.py
+++ b/passbook/providers/saml/forms.py
@@ -2,8 +2,10 @@
 
 from django import forms
 from django.contrib.admin.widgets import FilteredSelectMultiple
+from django.utils.html import mark_safe
 from django.utils.translation import gettext as _
 
+from passbook.admin.fields import CodeMirrorWidget
 from passbook.core.expression import PropertyMappingEvaluator
 from passbook.providers.saml.models import (
     SAMLPropertyMapping,
@@ -68,4 +70,13 @@ class SAMLPropertyMappingForm(forms.ModelForm):
             "name": forms.TextInput(),
             "saml_name": forms.TextInput(),
             "friendly_name": forms.TextInput(),
+            "expression": CodeMirrorWidget(mode="python"),
+        }
+        help_texts = {
+            "saml_name": mark_safe(
+                _(
+                    "URN OID used by SAML. This is optional. "
+                    '<a href="https://www.rfc-editor.org/rfc/rfc2798.html#section-2">Reference</a>'
+                )
+            ),
         }
diff --git a/passbook/sources/ldap/forms.py b/passbook/sources/ldap/forms.py
index 6536241d8..187a9d5dd 100644
--- a/passbook/sources/ldap/forms.py
+++ b/passbook/sources/ldap/forms.py
@@ -4,6 +4,7 @@ from django import forms
 from django.contrib.admin.widgets import FilteredSelectMultiple
 from django.utils.translation import gettext_lazy as _
 
+from passbook.admin.fields import CodeMirrorWidget
 from passbook.admin.forms.source import SOURCE_FORM_FIELDS
 from passbook.core.expression import PropertyMappingEvaluator
 from passbook.sources.ldap.models import LDAPPropertyMapping, LDAPSource
@@ -68,4 +69,8 @@ class LDAPPropertyMappingForm(forms.ModelForm):
             "name": forms.TextInput(),
             "ldap_property": forms.TextInput(),
             "object_field": forms.TextInput(),
+            "expression": CodeMirrorWidget(mode="python"),
+        }
+        help_texts = {
+            "object_field": _("Field of the user object this value is written to.")
         }