diff --git a/bin/hbase-config.sh b/bin/hbase-config.sh
index 5c518b1dc84..c113adb522b 100644
--- a/bin/hbase-config.sh
+++ b/bin/hbase-config.sh
@@ -98,22 +98,20 @@ if [ -z "$HBASE_ENV_INIT" ] && [ -f "${HBASE_CONF_DIR}/hbase-env.sh" ]; then
   export HBASE_ENV_INIT="true"
 fi
 
-# Set default value for regionserver uid if not present
-if [ -z "$HBASE_REGIONSERVER_UID" ]; then
-  HBASE_REGIONSERVER_UID="hbase"
-fi
-
 # Verify if hbase has the mlock agent
 if [ "$HBASE_REGIONSERVER_MLOCK" = "true" ]; then
-  MLOCK_AGENT="$HBASE_HOME/native/libmlockall_agent.so"
+  MLOCK_AGENT="$HBASE_HOME/lib/native/libmlockall_agent.so"
   if [ ! -f "$MLOCK_AGENT" ]; then
     cat 1>&2 <<EOF
 Unable to find mlockall_agent, hbase must be compiled with -Pnative
 EOF
     exit 1
   fi
-
-  HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS -agentpath:$MLOCK_AGENT=user=$HBASE_REGIONSERVER_UID"
+  if [ -z "$HBASE_REGIONSERVER_UID" ] || [ "$HBASE_REGIONSERVER_UID" == "$USER" ]; then
+      HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS -agentpath:$MLOCK_AGENT"
+  else
+      HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS -agentpath:$MLOCK_AGENT=user=$HBASE_REGIONSERVER_UID"
+  fi
 fi
 
 # Newer versions of glibc use an arena memory allocator that causes virtual