diff -u --recursive --new-file afd-1.3.6/src/UI/Motif/xsend_file/callbacks.c afd-1.3.7pre1/src/UI/Motif/xsend_file/callbacks.c
--- afd-1.3.6/src/UI/Motif/xsend_file/callbacks.c	2007-09-21 15:39:11.000000000 +0200
+++ afd-1.3.7pre1/src/UI/Motif/xsend_file/callbacks.c	2007-11-30 13:13:22.000000000 +0100
@@ -848,36 +848,10 @@
 
       case USER_NO_ENTER :
          (void)strcpy(db->user, value);
-         if (db->protocol == SMTP)
-         {
-            char *ptr = db->user;
-
-            while ((*ptr != '@') && (*ptr != '\0'))
-            {
-               ptr++;
-            }
-            if (*ptr == '@')
-            {
-               *ptr = '\0';
-            }
-         }
          break;
 
       case USER_ENTER :
          (void)strcpy(db->user, value);
-         if (db->protocol == SMTP)
-         {
-            char *ptr = db->user;
-
-            while ((*ptr != '@') && (*ptr != '\0'))
-            {
-               ptr++;
-            }
-            if (*ptr == '@')
-            {
-               *ptr = '\0';
-            }
-         }
          reset_message(statusbox_w);
          XmProcessTraversal(w, XmTRAVERSE_NEXT_TAB_GROUP);
          break;
diff -u --recursive --new-file afd-1.3.6/src/UI/Motif/xsend_file/create_url_file.c afd-1.3.7pre1/src/UI/Motif/xsend_file/create_url_file.c
--- afd-1.3.6/src/UI/Motif/xsend_file/create_url_file.c	2007-03-02 09:19:30.000000000 +0100
+++ afd-1.3.7pre1/src/UI/Motif/xsend_file/create_url_file.c	2007-11-30 13:13:03.000000000 +0100
@@ -143,21 +143,24 @@
            }
 
       length += sprintf(&buffer[length], "%s", db->user);
-      if ((db->password != NULL) && (db->password[0] != '\0'))
+      if (db->protocol != SMTP)
       {
-         length += sprintf(&buffer[length], ":%s", db->password);
-      }
-      length += sprintf(&buffer[length], "@%s", db->hostname);
-      if (db->target_dir[0] != '\0')
-      {
-         if ((db->target_dir[0] != '/') ||
-             ((db->target_dir[0] == '/') && (db->target_dir[1] != '/')))
+         if ((db->password != NULL) && (db->password[0] != '\0'))
          {
-            length += sprintf(&buffer[length], "/%s", db->target_dir);
+            length += sprintf(&buffer[length], ":%s", db->password);
          }
-         else
+         length += sprintf(&buffer[length], "@%s", db->hostname);
+         if (db->target_dir[0] != '\0')
          {
-            length += sprintf(&buffer[length], "%s", db->target_dir);
+            if ((db->target_dir[0] != '/') ||
+                ((db->target_dir[0] == '/') && (db->target_dir[1] != '/')))
+            {
+               length += sprintf(&buffer[length], "/%s", db->target_dir);
+            }
+            else
+            {
+               length += sprintf(&buffer[length], "%s", db->target_dir);
+            }
          }
       }
       if (db->smtp_server[0] != '\0')