--- network-manager-openvpn-0.3.2svn2855/src/nm-openvpn-service.c	2006-11-01 11:33:28.000000000 -0500
+++ network-manager-openvpn-0.3.2svn2855.new/src/nm-openvpn-service.c	2008-05-15 01:05:08.000000000 -0400
@@ -370,8 +370,8 @@
 	  if ( (io_data->username != NULL) &&
 	       (io_data->password != NULL) ) {
 	    gsize written;
-	    char *buf = g_strdup_printf ("username \"%s\" %s\n"
-					 "password \"%s\" %s\n",
+	    char *buf = g_strdup_printf ("username \"%s\" \"%s\"\n"
+					 "password \"%s\" \"%s\"\n",
 					 auth, io_data->username,
 					 auth, io_data->password);
 	    /* Will always write everything in blocking channels (on success) */
@@ -382,7 +382,7 @@
 	} else if ( strcmp (auth, "Private Key") == 0 ) {
 	  if ( io_data->certpass != NULL ) {
 	    gsize written;
-	    char *buf = g_strdup_printf ("password \"%s\" %s\n",
+	    char *buf = g_strdup_printf ("password \"%s\" \"%s\"\n",
 					 auth, io_data->certpass);
 	    // printf("1: sending: %s\n", buf);
 	    /* Will always write everything in blocking channels (on success) */