diff --git a/ldap.go b/ldap.go
index 773d1a9..e890b27 100644
--- a/ldap.go
+++ b/ldap.go
@@ -74,7 +74,7 @@ func (l LDAPConn) SearchDN(username string, person bool) (string, error) {
 	searchRequest := ldap.NewSearchRequest(
 		l.BaseDN,
 		ldap.ScopeWholeSubtree, ldap.NeverDerefAliases, 0, 0, false,
-		fmt.Sprintf("(&(objectClass=%s)(uid=%s))", objectClass, username),
+		fmt.Sprintf("(&(objectClass=%s)(uid=%s))", ldap.EscapeFilter(objectClass), ldap.EscapeFilter(username)),
 		[]string{"dn"},
 		nil,
 	)
@@ -147,7 +147,7 @@ func (l LDAPConn) SearchMailAlias(address string) (int, error) {
 	searchRequest := ldap.NewSearchRequest(
 		l.BaseDN,
 		ldap.ScopeWholeSubtree, ldap.NeverDerefAliases, 0, 0, false,
-		fmt.Sprintf("(&(objectClass=*)(mailAlias=%s))", address),
+		fmt.Sprintf("(&(objectClass=*)(mailAlias=%s))", ldap.EscapeFilter(address)),
 		[]string{"dn"},
 		nil,
 	)