--- dcl_importer.module	2008-01-10 06:24:07.000000000 +0100
+++ dcl_importer.new.module	2008-02-05 10:03:48.000000000 +0100
@@ -86,9 +86,15 @@ function dcl_importer_form_submit($form_
   $provider = $edit['provider'];
   $password = $edit['password'];
   $username = explode('@', $edit['username']);
-  if($provider == 'M' ) {
-    $username[0] = $username[0].'@hotmail.com';
-  } elseif( $provider == 'S' ) {
+  if ($provider == 'M') {
+    if (count($username) == 1) {
+      $username[0] = $username[0] .'@hotmail.com';
+    }
+    else {
+      $username[0] = $edit['username'];
+    }
+  }
+  elseif ($provider == 'S') {
     $username[0] = $edit['username'];
   }