diff --git a/debian/lib/setup-slapd b/debian/lib/setup-slapd
index a66f399..ed436c0 100755
--- a/debian/lib/setup-slapd
+++ b/debian/lib/setup-slapd
@@ -222,7 +222,7 @@ ldap {
 	server = "localhost"
 	identity = "uid=admin,ou=people,$SUFFIX"
 	password = "$PASSWORD"
-	basedn = "$ORGANIZATION,$SUFFIX"
+	basedn = "ou=$ORGANIZATION,$SUFFIX"
 	filter = "(uid=%{%{Stripped-User-Name}:-%{User-Name}})"
 	#base_filter = "(objectclass=radiusprofile)"
 
@@ -257,7 +257,7 @@ ldap {
 
 	# Mapping of RADIUS dictionary attributes to LDAP
 	# directory attributes.
-	dictionary_mapping = ${confdir}/ldap.attrmap
+	dictionary_mapping = \${confdir}/ldap.attrmap
 
 	#  Un-comment the following to disable Novell
 	#  eDirectory account policy check and intruder