Merge pull request #44 from fedosov/master

This should fix #42

1 files changed, 7 insertions, 3 deletions

diff --git a/lib/internet.js b/lib/internet.js
index e08308d0..898769de 100644
--- a/lib/internet.js
+++ b/lib/internet.js
@@ -2,16 +2,20 @@ var Faker = require('../index');
 
 var internet = {
     email: function () {
-        return this.userName() + "@" + this.domainName();
+        return Faker.Helpers.slugify(this.userName()) + "@" + Faker.Helpers.slugify(this.domainName());
     },
 
     userName: function () {
+        var result;
         switch (Faker.random.number(2)) {
         case 0:
-            return Faker.random.first_name();
+            result = Faker.random.first_name();
+            break;
         case 1:
-            return Faker.random.first_name() + Faker.random.array_element([".", "_"]) + Faker.random.last_name();
+            result = Faker.random.first_name() + Faker.random.array_element([".", "_"]) + Faker.random.last_name();
+            break;
         }
+        return result;
     },
 
     domainName: function () {