diff --git a/blocks/iomad_company_admin/uploaduser.php b/blocks/iomad_company_admin/uploaduser.php
index 7d8003d253a4..2bb06877e541 100644
--- a/blocks/iomad_company_admin/uploaduser.php
+++ b/blocks/iomad_company_admin/uploaduser.php
@@ -374,7 +374,7 @@
                     $user->username = $perfexistinguser->username;
                 } else {
                     // No existing user matches, generate a new username.
-                    $user->username = company_user::generate_username($user->email);
+                    $user->username = company_user::generate_username($user->email, $CFG->iomad_use_email_as_username);
                 }
                 $upt->track('username', $user->username);
             }
@@ -1195,7 +1195,7 @@
             $rowcols['username'] = $perfexistinguser->username;
         } else {
             // No existing user matches, generate a new username.
-            $rowcols['username'] = company_user::generate_username($rowcols['email']);
+            $rowcols['username'] = company_user::generate_username($rowcols['email'], $CFG->iomad_use_email_as_username);
         }
     }