diff --git a/oam/install_scripts/rsync.sh b/oam/install_scripts/rsync.sh
index 2fa53ee6b..476393eb4 100755
--- a/oam/install_scripts/rsync.sh
+++ b/oam/install_scripts/rsync.sh
@@ -6,7 +6,6 @@
 # Argument 1 - Remote Server Host Name or IP address
 # Argument 2 - Root Password of remote server
 # Argument 3 - Debug flag 1 for on, 0 for off
-set USERNAME "root@"
 set SERVER [lindex $argv 0]
 set PASSWORD [lindex $argv 1]
 set INSTALLDIR [lindex $argv 2]
@@ -15,13 +14,19 @@ set DEBUG [lindex $argv 3]
 log_user $DEBUG
 spawn -noecho /bin/bash
 
+if {[info exists env(USER)]} {
+    set USERNAME $env(USER)
+} else {
+    set USERNAME "root"
+}
+
 
 if { $PASSWORD == "ssh" } {
 	set USERNAME ""
 	set PASSWORD ""
 }
 
-set COMMAND "rsync -vopgr -e ssh --exclude=mysql/ --exclude=test/ --exclude=infinidb_vtable/ --exclude=infinidb_querystats/ --exclude=calpontsys/ --include=*/ --include=*/* --exclude=* $INSTALLDIR/mysql/db/ $USERNAME$SERVER:$INSTALLDIR/mysql/db/"
+set COMMAND "rsync -vopgr -e ssh --exclude=mysql/ --exclude=test/ --exclude=infinidb_vtable/ --exclude=infinidb_querystats/ --exclude=calpontsys/ --include=*/ --include=*/* --exclude=* $INSTALLDIR/mysql/db/ $USERNAME$@SERVER:$INSTALLDIR/mysql/db/"
 
 #
 # run command
diff --git a/oamapps/postConfigure/helpers.cpp b/oamapps/postConfigure/helpers.cpp
index 36cca5177..c2157bc5d 100644
--- a/oamapps/postConfigure/helpers.cpp
+++ b/oamapps/postConfigure/helpers.cpp
@@ -491,7 +491,7 @@ int sendReplicationRequest(int IserverTypeInstall, std::string password, std::st
 							returnStatus = sendMsgProcMon( (*pt).DeviceName, msg1, requestID, 600 );
 			
 							if ( returnStatus != API_SUCCESS) {
-								cout << "ERROR: Error return in running the MariaDB Columnstore Master DB Distribute, check /tmp/master-dist.logs on " << masterModule << endl;
+								cout << endl << "ERROR: Error return in running the MariaDB Columnstore Master DB Distribute, check /tmp/master-dist.logs on " << masterModule << endl;
 								return returnStatus;
 							}
 
@@ -503,7 +503,7 @@ int sendReplicationRequest(int IserverTypeInstall, std::string password, std::st
 							returnStatus = sendMsgProcMon( (*pt).DeviceName, msg, requestID, 30 );
 			
 							if ( returnStatus != API_SUCCESS) {
-								cout << "ERROR: Error return in running the MariaDB Columnstore Master replication, check /tmp/master-rep*.logs on " << masterModule << endl;
+								cout << endl << "ERROR: Error return in running the MariaDB Columnstore Master replication, check /tmp/master-rep*.logs on " << masterModule << endl;
 								return returnStatus;
 							}
 
@@ -534,7 +534,7 @@ int sendReplicationRequest(int IserverTypeInstall, std::string password, std::st
 							returnStatus = sendMsgProcMon( (*pt).DeviceName, msg, requestID, 30 );
 			
 							if ( returnStatus != API_SUCCESS) {
-								cout << "ERROR: Error return in running the MariaDB Columnstore Slave replication, check /tmp/slave-rep*.logs on " << (*pt).DeviceName << endl;
+								cout << endl << "ERROR: Error return in running the MariaDB Columnstore Slave replication, check /tmp/slave-rep*.logs on " << (*pt).DeviceName << endl;
 								return returnStatus;
 							}
 
@@ -543,7 +543,7 @@ int sendReplicationRequest(int IserverTypeInstall, std::string password, std::st
 					}
 					else
 					{
-						cout << "ERROR: Module not Active, replication not done on " << (*pt).DeviceName << endl;
+						cout << endl << "ERROR: Module not Active, replication not done on " << (*pt).DeviceName << endl;
 						pt++;
 					}
 				}