diff --git a/setup/class_setupStep_Migrate.inc b/setup/class_setupStep_Migrate.inc
index 3496433a61f6f5e09ae39a6a49f4658342c96221..7be7f6fc8bd86b2dc75a98ad551fd1a5aa4c396b 100644
--- a/setup/class_setupStep_Migrate.inc
+++ b/setup/class_setupStep_Migrate.inc
@@ -845,7 +845,7 @@ class Step_Migrate extends setup_step
         }
       }
 
-      /* Try to find an old FD 1.0.7 administrative account that may be migrated */
+      /* Try to find an old FD 1.0.7 administrator account that may be migrated */
       if (!$FD_1_0_8_found) {
         $valid_users  = "";
         $valid_groups = "";
@@ -945,7 +945,7 @@ class Step_Migrate extends setup_step
       if ($FD_1_0_7_found) {
         $str = "";
         if (!empty($valid_groups)) {
-          $str .= "<i>".sprintf(_("FD 1.0.7 administrative accounts found: %s"), trim($valid_groups, ", "))."</i><br>";
+          $str .= "<i>".sprintf(_("FD 1.0.7 administrator accounts found: %s"), trim($valid_groups, ", "))."</i><br>";
         }
         $this->checks['acls']['STATUS']     = FALSE;
         $this->checks['acls']['STATUS_MSG'] = _("Failed");
@@ -1189,7 +1189,7 @@ class Step_Migrate extends setup_step
 
     $ldap->cat($dn, array("dn"));
     if ($ldap->count()) {
-      msg_dialog::display(_("Error"), sprintf(_("Adding an administrative user failed: object '%s' already exists!"), LDAP::fix($dn)), ERROR_DIALOG);
+      msg_dialog::display(_("Error"), sprintf(_("Adding an administrator user failed: object '%s' already exists!"), LDAP::fix($dn)), ERROR_DIALOG);
       return FALSE;
     }
 
@@ -1439,7 +1439,7 @@ class Step_Migrate extends setup_step
     }
 
     /*************
-     * Administrative Account -- Migrate/Create
+     * Administrator Account -- Migrate/Create
      *************/
 
     if (isset($_POST['retry_acls'])) {
@@ -2825,7 +2825,7 @@ class Step_Migrate extends setup_step
       $this->migrate_users[$id]['checked'] = isset($_POST['migrate_admin_'.$id]);
     }
 
-    /* Try to find an old GOsa 2.5 administrative account that may be migrated */
+    /* Try to find an old GOsa 2.5 administrator account that may be migrated */
     if (!count($this->migrate_users)) {
       //FIXME
     }
diff --git a/setup/setup_migrate.tpl b/setup/setup_migrate.tpl
index cd19c0b32ad565d06e8be39b3f9d6ce6208a953e..c4910b54035cd4d13202e34bd05e9b7469b5d688 100644
--- a/setup/setup_migrate.tpl
+++ b/setup/setup_migrate.tpl
@@ -168,7 +168,7 @@
 
 
     {elseif $method == "migrate_acls"}
-      <h2>{t}Migrate GOsa 2.5 administrative accounts{/t}</h2>
+      <h2>{t}Migrate GOsa 2.5 administrator accounts{/t}</h2>
             <p>
             {t}This dialog allows the migration of GOsa 2.5 admin accounts into FusionDirectory 1.0 useable accounts.{/t}
             </p>