diff -Nur smeserver-userpanels-1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-forwarding smeserver-userpanels-1.0_mod/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-forwarding
--- smeserver-userpanels-1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-forwarding	2012-09-07 17:42:33.855470957 +0200
+++ smeserver-userpanels-1.0_mod/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-forwarding	2012-09-07 17:53:57.295054399 +0200
@@ -34,6 +34,10 @@
       <trans>Unacceptable characters, or Domain name missing.</trans>
     </entry>
     <entry>
+      <base>VALID_EMAIL_NEEDED</base>
+      <trans>A valid email address is needed</trans>
+    </entry>
+    <entry>
       <base>EMAIL_DELIVERY</base>
       <trans>Email Delivery</trans>
     </entry>
diff -Nur smeserver-userpanels-1.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userpanelForwarding.pm smeserver-userpanels-1.0_mod/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userpanelForwarding.pm
--- smeserver-userpanels-1.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userpanelForwarding.pm	2006-03-26 00:00:58.000000000 +0100
+++ smeserver-userpanels-1.0_mod/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userpanelForwarding.pm	2012-09-07 17:54:08.479507450 +0200
@@ -34,16 +34,22 @@
     my $fm = shift;
     my $q = $fm->{cgi};
 
+    my $Forward = $q->param('EmailForward');
     my $ForwardAddress = $q->param('ForwardAddress') || '';
     $ForwardAddress =~ s/^\s+|\s+$//g;
 
     my $response = $fm->email_simple($ForwardAddress);
-    if (($response eq 'OK') or ($ForwardAddress eq ''))
-    {
+    if ($response eq 'OK')
+    {   
         return 'OK';
     }
+    elsif ($ForwardAddress eq '')
+    {   
+        return 'OK' if ($Forward eq 'local');
+        return 'VALID_EMAIL_NEEDED';
+    }
     else
-    {
+    {   
         return 'UNACCEPTABLE_CHARS';
     }
 }
@@ -65,4 +71,4 @@
     $fm->success('SUCCESS');
 }
 
-1;
\ Pas de fin de ligne à la fin du fichier.
+1;