diff --git a/repmgr.c b/repmgr.c
index e0b32ed8..6521019a 100644
--- a/repmgr.c
+++ b/repmgr.c
@@ -6991,7 +6991,11 @@ run_basebackup(const char *data_dir, int server_version)
 			appendPQExpBuffer(&params, " -p %s", runtime_options.masterport);
 		}
 
-		if (strlen(runtime_options.username))
+		if (strlen(runtime_options.replication_user))
+		{
+			appendPQExpBuffer(&params, " -U %s", runtime_options.replication_user);
+		}
+		else if (strlen(runtime_options.username))
 		{
 			appendPQExpBuffer(&params, " -U %s", runtime_options.username);
 		}
@@ -8048,6 +8052,9 @@ check_upstream_config(PGconn *conn, int server_version_num, bool exit_on_error)
 
 		param_set(&repl_conninfo, "replication", "1");
 
+		if (*runtime_options.replication_user)
+			param_set(&repl_conninfo, "user", runtime_options.replication_user);
+
 		/*
 		 * work out how many replication connections are required (1 or 2)
 		 */