diff --git a/htdocs/copy.php b/htdocs/copy.php
index 34d1512..fad7d92 100644
--- a/htdocs/copy.php
+++ b/htdocs/copy.php
@@ -63,7 +63,7 @@ if ($request['recursive']) {
 	print '</small>';
 
 } else {
-	if ($_SESSION[APPCONFIG]->getValue('confirm','copy')) {
+	if ($_SESSION[APPCONFIG]->getValue('confirm','copy') && !$request['remove']) {
 		$request['pageSRC'] = new TemplateRender($ldap['SRC']->getIndex(),get_request('template','REQUEST',false,null));
 		$request['pageSRC']->setDN($request['dnSRC']);
 		$request['pageSRC']->accept(true);
diff --git a/lib/ds_ldap.php b/lib/ds_ldap.php
index 8bc1ef8..554f9de 100644
--- a/lib/ds_ldap.php
+++ b/lib/ds_ldap.php
@@ -251,7 +251,7 @@ class ldap extends DS {
 			else
 				$userDN = $this->getLoginID($user,'login');
 
-			if (! $userDN && $this->getValue('login','fallback_dn'))
+			if (! $userDN && $this->getValue('login','fallback_dn') && strpos($user, '='))
 				$userDN = $user;
 
 			if (! $userDN)