diff --git a/dbcon/mysql/mysql-Columnstore b/dbcon/mysql/mysql-Columnstore
index 0aef31751..5b7e69cd7 100755
--- a/dbcon/mysql/mysql-Columnstore
+++ b/dbcon/mysql/mysql-Columnstore
@@ -62,9 +62,18 @@ datadir=$basedir/db
 # 0 means don't wait at all
 # Negative numbers mean to wait indefinitely
 service_startup_timeout=90
+user=`whoami 2>/dev/null`
 
-# Lock directory for RedHat / SuSE.
+# Lock directory for root user
 lockdir='/var/lock/subsys'
+# Lock directory for non-root user
+if $user != "root"
+then
+  lockdir='$HOME/.lock'
+fi
+
+mkdir $lockdir
+
 lock_file_path="$lockdir/mysql-Columnstore"
 
 # The following variables are only set for letting mysql.server find things.
diff --git a/oam/install_scripts/columnstore b/oam/install_scripts/columnstore
index bf50e7cc0..5addd4c6a 100644
--- a/oam/install_scripts/columnstore
+++ b/oam/install_scripts/columnstore
@@ -58,12 +58,22 @@ fi
 
 user=`whoami 2>/dev/null`
 
+# Lock directory for root user
+lockdir='/var/lock/subsys'
+# Lock directory for non-root user
+if $user != "root"
+then
+  lockdir='$HOME/.lock'
+fi
+
+mkdir $lockdir
+
 checkInstallSetup() {
 	InitialInstallFlag=`$InstallDir/bin/getConfig -c $InstallDir/etc/Columnstore.xml Installation InitialInstallFlag`
 	if [ $InitialInstallFlag != "y" ]; then
 		echo "Please run the postConfigure install script, check the Installation Guide"
 		echo "for additional details"
-		rm -f /var/lock/subsys/columnstore
+		rm -f $lockdir/columnstore
 		exit 1
 	fi
 }
@@ -71,18 +81,18 @@ checkInstallSetup() {
 [ -f $InstallDir/bin/ProcMon ] || exit 0
 
 start() {
-	if [ -f /var/lock/subsys/columnstore ]; then
+	if [ -f $lockdir/columnstore ]; then
 		echo "MariaDB Columnstore Database Platform already running"
 		exit 0
 	fi
 
-	(mkdir -p /var/lock/subsys && touch /var/lock/subsys/columnstore) >/dev/null 2>&1
+	(mkdir -p $lockdir//subsys && touch $lockdir/columnstore) >/dev/null 2>&1
 
 	if [ -x $InstallDir/bin/columnstore.pre-start ]; then
 		$InstallDir/bin/columnstore.pre-start
 		if [ $? -ne 0 ]; then
 			echo "Error running MariaDB Columnstore pre-start script, not starting MariaDB Columnstore"
-			rm -f /var/lock/subsys/columnstore
+			rm -f $lockdir/columnstore
 			exit 1
 		fi
 	fi
@@ -111,7 +121,7 @@ stop() {
 	sleep 1
 	$InstallDir/bin/clearShm
 	RETVAL=$?
-	rm -f /var/lock/subsys/columnstore
+	rm -f $lockdir/columnstore
 	fuser -k 8604/tcp > /dev/null 2>&1
 	test -f $InstallDir/mysql/mysql-Columnstore || return $RETVAL
 	$InstallDir/mysql/mysql-Columnstore stop > /dev/null 2>&1
@@ -127,7 +137,7 @@ restart() {
 status() {
 	isrunning=0
 	if [ $EUID -eq 0 ]; then
-		if [ -f /var/lock/subsys/columnstore ]; then
+		if [ -f $lockdir/columnstore ]; then
 			isrunning=1
 		fi
 	else
@@ -155,7 +165,7 @@ restart)
 	restart
 	;;
 condrestart)
-	[ -f /var/lock/subsys/columnstore ] && restart || :
+	[ -f $lockdir/columnstore ] && restart || :
 	;;
 status)
 	status
diff --git a/oam/oamcpp/liboamcpp.cpp b/oam/oamcpp/liboamcpp.cpp
index dfe3822be..9453409a9 100644
--- a/oam/oamcpp/liboamcpp.cpp
+++ b/oam/oamcpp/liboamcpp.cpp
@@ -147,6 +147,19 @@ Oam::Oam()
         }
         catch (...) {} // defaulted to false
     }
+    
+    //get user
+    string USER = "root";
+    char* p = getenv("USER");
+
+    if (p && *p)
+	USER = p;
+
+    userDir = USER;
+
+    if ( USER != "root")
+	userDir = "home/" + USER;
+
 }
 
 Oam::~Oam()
@@ -10669,10 +10682,12 @@ bool Oam::checkSystemRunning()
     // string cmd = startup::StartUp::installDir() + "/bin/columnstore status > /tmp/status.log";
     // system(cmd.c_str());
     struct stat st;
-
-    if (stat("/var/lock/subsys/columnstore", &st) == 0)
+    
+    string lockFile = userDir + "/columnstore";
+    
+    if (stat(lockFile.c_str(), &st) == 0)
     {
-        return true;
+	return true;
     }
 
     if (geteuid() != 0)
diff --git a/oam/oamcpp/liboamcpp.h b/oam/oamcpp/liboamcpp.h
index 66482bc25..e82771e47 100644
--- a/oam/oamcpp/liboamcpp.h
+++ b/oam/oamcpp/liboamcpp.h
@@ -2523,6 +2523,7 @@ private:
     std::string ProcessConfigFile;
     std::string InstallDir;
     static int  UseHdfs;
+    std::string userDir;
 
 };	// end of class