diff --git a/repmgr.c b/repmgr.c
index ebcdc970..27c365be 100644
--- a/repmgr.c
+++ b/repmgr.c
@@ -242,6 +242,7 @@ main(int argc, char **argv)
 		{"local-port", required_argument, NULL, 'l'},
 		{"initdb-no-pwprompt", no_argument, NULL, OPT_INITDB_NO_PWPROMPT},
 		{"ignore-external-config-files", no_argument, NULL, OPT_IGNORE_EXTERNAL_CONFIG_FILES},
+		{"no-conninfo-password", no_argument, NULL, OPT_NO_CONNINFO_PASSWORD},
 		{NULL, 0, NULL, 0}
 	};
 
@@ -528,6 +529,9 @@ main(int argc, char **argv)
 			case OPT_UPSTREAM_CONNINFO:
 				strncpy(runtime_options.upstream_conninfo, optarg, MAXLEN);
 				break;
+			case OPT_NO_CONNINFO_PASSWORD:
+				runtime_options.no_conninfo_password = true;
+				break;
 			case OPT_REGISTER_WAIT:
 				runtime_options.wait_register_sync = true;
 				if (optarg != NULL)
@@ -6361,6 +6365,7 @@ do_help(void)
 	printf(_("  --no-upstream-connection            (standby clone) when using Barman, do not connect to upstream node\n"));
 	printf(_("  --upstream-conninfo                 (standby clone) 'primary_conninfo' value to write in recovery.conf\n" \
 			 "                                        when the intended upstream server does not yet exist\n"));
+	printf(_("  --no-conninfo-password              (standby clone) do not write passwords into primary_conninfo\n"));
 	printf(_("  --without-barman                    (standby clone) do not use Barman even if configured\n"));
 	printf(_("  --recovery-min-apply-delay=VALUE    (standby clone, follow) set recovery_min_apply_delay\n" \
 			 "                                        in recovery.conf (PostgreSQL 9.4 and later)\n"));
@@ -6543,6 +6548,8 @@ write_primary_conninfo(char *line, t_conninfo_param_list *param_list)
 		 */
 		if (strcmp(param_list->keywords[c], "dbname") == 0 ||
 		    strcmp(param_list->keywords[c], "replication") == 0 ||
+			(runtime_options.no_conninfo_password &&
+			 strcmp(param_list->keywords[c], "password") == 0) ||
 		    (param_list->values[c] == NULL) ||
 		    (param_list->values[c] != NULL && param_list->values[c][0] == '\0'))
 			continue;
diff --git a/repmgr.h b/repmgr.h
index 4d7c0441..7dcd1f3d 100644
--- a/repmgr.h
+++ b/repmgr.h
@@ -64,6 +64,7 @@
 #define OPT_CLUSTER                      13
 #define OPT_LOG_TO_FILE                  14
 #define OPT_UPSTREAM_CONNINFO            15
+#define OPT_NO_CONNINFO_PASSWORD         16
 
 /* deprecated command line options */
 #define OPT_INITDB_NO_PWPROMPT           998
@@ -108,6 +109,7 @@ typedef struct
 	bool		fast_checkpoint;
 	bool		without_barman;
 	bool		no_upstream_connection;
+	bool		no_conninfo_password;
 	bool		copy_external_config_files;
 	int			copy_external_config_files_destination;
 	bool		wait_register_sync;
@@ -152,7 +154,7 @@ typedef struct
 		false, false, false,		    \
 		/* standby clone parameters */  \
 		false, DEFAULT_WAL_KEEP_SEGMENTS, false, false, false, false, false, false, \
-		CONFIG_FILE_SAMEPATH, false, 0, "", "",						\
+		false, CONFIG_FILE_SAMEPATH, false, 0, "", "", \
 		/* witness create parameters */ \
 		false,                          \
 		/* standby follow parameters */ \