diff --git a/vfs/ChangeLog b/vfs/ChangeLog
index 964361649..138b19eb8 100644
--- a/vfs/ChangeLog
+++ b/vfs/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-13  Andrew V. Samoilov  <sav@bcs.zp.ua>
+
+	* samba/libsmb/clientgen.c (cli_session_setup): Convert
+	username from Unix to DOS codepage before sending.
+
 2003-03-10  Adam Byrtek  <alpha@debian.org>
 
 	* extfs/patchfs.in: Minor cleanups.
diff --git a/vfs/samba/libsmb/clientgen.c b/vfs/samba/libsmb/clientgen.c
index 94c5b84b6..081d0e251 100644
--- a/vfs/samba/libsmb/clientgen.c
+++ b/vfs/samba/libsmb/clientgen.c
@@ -754,6 +754,7 @@ BOOL cli_session_setup(struct cli_state *cli,
 		p += passlen;
 		pstrcpy(p,user);
 		strupper(p);
+		unix_to_dos (p, True);
 	}
 	else
 	{
@@ -776,6 +777,7 @@ BOOL cli_session_setup(struct cli_state *cli,
 		p += SVAL(cli->outbuf,smb_vwv8);
 		pstrcpy(p,user);
 		strupper(p);
+		unix_to_dos (p, True);
 		p = skip_string(p,1);
 		pstrcpy(p,workgroup);
 		strupper(p);