diff --git a/modules/importer/importer.admin.controller.php b/modules/importer/importer.admin.controller.php
index 74b2e4ec6..27d4e29d8 100644
--- a/modules/importer/importer.admin.controller.php
+++ b/modules/importer/importer.admin.controller.php
@@ -416,7 +416,6 @@ class importerAdminController extends importer
 			{
 				$obj->email_address = $obj->user_id . '@example.com';
 			}
-			list($obj->email_id, $obj->email_host) = explode('@', $obj->email);
 			// Set the mailing option
 			if($obj->allow_mailing!='Y') $obj->allow_mailing = 'N';
 			// Set the message option
@@ -453,9 +452,18 @@ class importerAdminController extends importer
 				$obj->email_address = $obj->user_id . '@example.com';
 			}
 
+			list($obj->email_id, $obj->email_host) = explode('@', $obj->email_address);
+			if (!$obj->email_id)
+			{
+				$obj->email_id = '';
+			}
+			if (!$obj->email_host)
+			{
+				$obj->email_host = '';
+			}
+
 			// Add a member
 			$output = executeQuery('member.insertMember', $obj);
-
 			if($output->toBool() && !($obj->password))
 			{
 				// Send a mail telling the user to reset his password.