diff --git a/setup/class_setupStepMigrate.inc b/setup/class_setupStepMigrate.inc
index 503ab63b228ddd422f836fa33d56eb3aeb875f05..646201e382a610d1ed293967512fd0245f69bf3f 100644
--- a/setup/class_setupStepMigrate.inc
+++ b/setup/class_setupStepMigrate.inc
@@ -1120,7 +1120,7 @@ class setupStepMigrate extends setupStep
         $dn = base64_decode($b_dn);
         $d_dn = preg_replace('/,.*$/', ','.$destination_dep, $dn);
         if ($only_ldif) {
-          $entry['ldif'] = _('Entry will be moved from').":<br/>\t".($ldap->fix($dn)).'<br/>'._('to').":<br/>\t".($ldap->fix($d_dn));
+          $entry['ldif'] = _('Entry will be moved from').":<br/>\t".htmlentities($dn, ENT_COMPAT, 'UTF-8').'<br/>'._('to').":<br/>\t".htmlentities($d_dn, ENT_COMPAT, 'UTF-8');
 
           /* Check if there are references to this object */
           $ldap->search('(&(member='.ldap_escape_f($dn).')(|(objectClass=gosaGroupOfNames)(objectClass=groupOfNames)))', ['dn']);
diff --git a/setup/setup_migrate_accounts.tpl b/setup/setup_migrate_accounts.tpl
index 0d2bcbebaa17d4938e3d4af9aab8d67471379373..1bd51f855247987d3ec38dc0630063f0208cb762 100644
--- a/setup/setup_migrate_accounts.tpl
+++ b/setup/setup_migrate_accounts.tpl
@@ -24,7 +24,7 @@
       {if $entry.checked}
         <input type="checkbox" name="migrate_{$key}" checked="checked" id="migrate_{$key}"/>
         <label for="migrate_{$key}">{$entry.dn}</label>
-        {if $entry.after != ""}
+        {if !empty($entry.after)}
           <div class="step2-entry-container-info">
             {t}Current{/t}
             <div style="padding-left:20px;">