diff --git a/src/openvpn/manage.c b/src/openvpn/manage.c
index df72f15f..5cb25107 100644
--- a/src/openvpn/manage.c
+++ b/src/openvpn/manage.c
@@ -2653,9 +2653,9 @@ man_connection_init(struct management *man)
 
         /*
          * Allocate helper objects for command line input and
-         * command output from/to the socket.
+         * command output from/to the socket. Ensure a password cat fit.
          */
-        man->connection.in = command_line_new(1024);
+        man->connection.in = command_line_new(USER_PASS_LEN);
         man->connection.out = buffer_list_new();
 
         /*
diff --git a/src/openvpn/options.h b/src/openvpn/options.h
index 3d8b5059..4fafdc52 100644
--- a/src/openvpn/options.h
+++ b/src/openvpn/options.h
@@ -51,10 +51,10 @@
 #define MAX_PARMS 16
 
 /*
- * Max size of options line and parameter.
+ * Max size of options line and parameter. Ensure a password can fit.
  */
-#define OPTION_PARM_SIZE 256
-#define OPTION_LINE_SIZE 256
+#define OPTION_PARM_SIZE USER_PASS_LEN
+#define OPTION_LINE_SIZE USER_PASS_LEN
 
 extern const char title_string[];