diff --git a/oam/oamcpp/liboamcpp.cpp b/oam/oamcpp/liboamcpp.cpp
index 7ae5d5bfe..72c037fa1 100644
--- a/oam/oamcpp/liboamcpp.cpp
+++ b/oam/oamcpp/liboamcpp.cpp
@@ -8729,6 +8729,8 @@ namespace oam
 	******************************************************************************************/
 	std::string Oam::getMySQLPassword()
 	{
+		string mysqlUser = "root";
+		
 		string USER = "root";
 		char* p= getenv("USER");
 		if (p && *p)
@@ -8757,8 +8759,8 @@ namespace oam
 		while (file.getline(line, 400))
 		{
 			buf = line;
-			//find the mariadb user, root
-			string::size_type pos = buf.find("root",0);
+			string::size_type pos = buf.find(mysqlUser,0);
+
 			if (pos != string::npos)
 			{
 				file.getline(line, 400);
@@ -8771,12 +8773,15 @@ namespace oam
 					if (pos1 != string::npos) {
 						//password found
 
-						string password = buf.substr(pos1+2, 80);
+						string password = buf.substr(pos1+1, 80);
+						password.erase(remove_if(password.begin(), password.end(), ::isspace), password.end());
 
 						writeLog("getMySQLPassword: password found", LOG_TYPE_DEBUG);
 						return password;
 					}
 				}
+				
+				break;
 			}
 		}
 		file.close();
diff --git a/oam/oamcpp/liboamcpp.h b/oam/oamcpp/liboamcpp.h
index a8685eb89..68c6400c6 100644
--- a/oam/oamcpp/liboamcpp.h
+++ b/oam/oamcpp/liboamcpp.h
@@ -33,6 +33,7 @@
 #include <limits.h>
 #include <sstream>
 #include <vector>
+#include <algorithm>
 #ifdef __linux__
 #include <sys/sysinfo.h>
 #include <netdb.h>