diff --git a/lam-0.4/templates/account/groupedit.php b/lam-0.4/templates/account/groupedit.php
index 8a48bd3e..d0e285e5 100644
--- a/lam-0.4/templates/account/groupedit.php
+++ b/lam-0.4/templates/account/groupedit.php
@@ -76,6 +76,7 @@ if (isset($_GET['DN']) && $_GET['DN']!='') {
 	$account_old =& $_SESSION['account_'.$varkey.'_account_old'];
 	// get "real" DN from variable
 	$DN = str_replace("\'", '',$_GET['DN']);
+	if ($_GET['DN'] == $DN) $DN = str_replace("'", '',$_GET['DN']);
 	// Load existing group
 	$account_new = loadgroup($DN);
 	// Get a copy of original host
diff --git a/lam-0.4/templates/account/hostedit.php b/lam-0.4/templates/account/hostedit.php
index e582b767..de0c9687 100644
--- a/lam-0.4/templates/account/hostedit.php
+++ b/lam-0.4/templates/account/hostedit.php
@@ -72,6 +72,7 @@ if (isset($_GET['DN']) && $_GET['DN']!='') {
 	$account_old =& $_SESSION['account_'.$varkey.'_account_old'];
 	// get "real" DN from variable
 	$DN = str_replace("\'", '',$_GET['DN']);
+	if ($_GET['DN'] == $DN) $DN = str_replace("'", '',$_GET['DN']);
 	// Load existing host
 	$account_new = loadhost($DN);
 	// Get a copy of original host
diff --git a/lam-0.4/templates/account/useredit.php b/lam-0.4/templates/account/useredit.php
index 274e4ba7..bd8cbc5e 100644
--- a/lam-0.4/templates/account/useredit.php
+++ b/lam-0.4/templates/account/useredit.php
@@ -79,6 +79,7 @@ if (isset($_GET['DN']) && $_GET['DN']!='') {
 	$account_old =& $_SESSION['account_'.$varkey.'_account_old'];
 	// get "real" DN from variable
 	$DN = str_replace("\'", '',$_GET['DN']);
+	if ($_GET['DN'] == $DN) $DN = str_replace("'", '',$_GET['DN']);
 	// Load existing group
 	$account_new = loaduser($DN);
 	$account_old = $account_new;