3 files changed, 10 insertions, 3 deletions
diff --git a/src/locales/el/person/last_name.ts b/src/locales/el/person/last_name.ts
index 70634100..79c0caff 100644
--- a/src/locales/el/person/last_name.ts
+++ b/src/locales/el/person/last_name.ts
@@ -32,7 +32,7 @@ export default [
   'Αρβανίτης',
   'Αργυριάδης',
   'Ασπάσιος',
-  'Αυγερινός (επώνυμο)',
+  'Αυγερινός',
   'Βάμβας',
   'Βαμβακάς',
   'Βαρνακιώτης',
@@ -147,7 +147,7 @@ export default [
   'Λόντος',
   'Λύτρας',
   'Λαγός',
-  'Λαιμός (επώνυμο)',
+  'Λαιμός',
   'Λαμέρας',
   'Λαμπρόπουλος',
   'Λειβαδάς',
diff --git a/src/locales/fa/person/last_name.ts b/src/locales/fa/person/last_name.ts
index c012140e..57d4abc9 100644
--- a/src/locales/fa/person/last_name.ts
+++ b/src/locales/fa/person/last_name.ts
@@ -57,7 +57,7 @@ export default [
   'کوشکی',
   'کهنمویی',
   'کیان',
-  'کیانی (نام خانوادگی)',
+  'کیانی',
   'کیمیایی',
   'گل محمدی',
   'گلپایگانی',
diff --git a/src/modules/internet/index.ts b/src/modules/internet/index.ts
index f7f022ac..d1af8ebe 100644
--- a/src/modules/internet/index.ts
+++ b/src/modules/internet/index.ts
@@ -91,6 +91,13 @@ export class InternetModule {
       );
 
     let localPart: string = this.userName(firstName, lastName);
+    // Strip any special characters from the local part of the email address
+    // This could happen if invalid chars are passed in manually in the firstName/lastName
+    localPart = localPart.replace(/[^A-Za-z0-9._+\-]+/g, '');
+
+    // The local part of an email address is limited to 64 chars per RFC 3696
+    // We limit to 50 chars to be more realistic
+    localPart = localPart.substring(0, 50);
     if (options?.allowSpecialCharacters) {
       const usernameChars: string[] = '._-'.split('');
       const specialChars: string[] = ".!#$%&'*+-/=?^_`{|}~".split('');