diff --git a/SAS/MoM/MoMQueryService/momqueryservice.py b/SAS/MoM/MoMQueryService/momqueryservice.py
index d598a2774896df9d9d53934d8ae4abdd52ec177a..6d4bc1f1f1889c71b152e6ad5b6742dbd4d5cf89 100755
--- a/SAS/MoM/MoMQueryService/momqueryservice.py
+++ b/SAS/MoM/MoMQueryService/momqueryservice.py
@@ -71,12 +71,13 @@ def _toIdsString(mom_ids):
     return ids_str
 
 class MoMDatabaseWrapper:
-    '''handler class for details query in mom db'''
+    """handler class for details query in mom db"""
     def __init__(self, dbcreds):
         self.dbcreds = dbcreds
         self.conn = None
-        self.useradministration_db = "useradministration"
-        self.momprivilidge_db = "momprivilege"
+
+        self.useradministration_db = dbcreds.config["useradministration_database"]
+        self.momprivilidge_db = dbcreds.config["momprivilege_database"]
 
     def _connect(self):
         if self.conn:
diff --git a/SAS/MoM/MoMQueryService/test/test_momqueryservice.py b/SAS/MoM/MoMQueryService/test/test_momqueryservice.py
index d4a698a72a838cece4902d98a5ea12926ed207e5..57dc419f648b6cfc66e51310c22e5885e3f2fe88 100755
--- a/SAS/MoM/MoMQueryService/test/test_momqueryservice.py
+++ b/SAS/MoM/MoMQueryService/test/test_momqueryservice.py
@@ -37,6 +37,8 @@ class TestProjectDetailsQueryHandler(unittest.TestCase):
     database_credentials.user = "root"
     database_credentials.database = "testdb"
     database_credentials.password = None
+    database_credentials.config = {"useradministration_database": "useradministration",
+                                   "momprivilege_database": "momprivilege"}
 
     project_name = "project name"
     folder = "/project/folder"
@@ -149,20 +151,20 @@ class TestMomQueryRPC(unittest.TestCase):
                                                        "status": "OK"
                                                    })
     qpid_message_authorized_true = QpidMessage({"authorized": True},
-                                                   properties={
-                                                       "SystemName": "LOFAR",
-                                                       "MessageType": "ReplyMessage",
-                                                       "MessageId": message_id,
-                                                       "status": "OK"
-                                                   })
+                                               properties={
+                                                   "SystemName": "LOFAR",
+                                                   "MessageType": "ReplyMessage",
+                                                   "MessageId": message_id,
+                                                   "status": "OK"
+                                               })
 
     qpid_message_allows_true = QpidMessage({"allows": True},
-                                                   properties={
-                                                       "SystemName": "LOFAR",
-                                                       "MessageType": "ReplyMessage",
-                                                       "MessageId": message_id,
-                                                       "status": "OK"
-                                                   })
+                                           properties={
+                                               "SystemName": "LOFAR",
+                                               "MessageType": "ReplyMessage",
+                                               "MessageId": message_id,
+                                               "status": "OK"
+                                           })
 
     def setUp(self):
         # the mock library had difficulty to mock ToBus and FromBus probably to some weir naming issue.
@@ -325,6 +327,8 @@ class TestMoMDatabaseWrapper(unittest.TestCase):
     database_credentials.user = "root"
     database_credentials.database = "testdb"
     database_credentials.password = None
+    database_credentials.config = {"useradministration_database": "useradministration",
+                                   "momprivilege_database": "momprivilege"}
 
     project_name = "project name"
     folder = "/project/folder1/folder2"
@@ -502,6 +506,8 @@ class IntegrationTestMoMDatabaseWrapper(unittest.TestCase):
     database_credentials.user = "root"
     database_credentials.database = "mom"
     database_credentials.password = None
+    database_credentials.config = {"useradministration": "useradministration",
+                                   "momprivilege": "momprivilege"}
 
     project_name = "project name"
     folder = "/project/folder1/folder2"
@@ -595,11 +601,12 @@ class IntegrationTestMoMDatabaseWrapper(unittest.TestCase):
                        "id int(11) NOT NULL AUTO_INCREMENT, "
                        "mom2objectid int(11) DEFAULT NULL, "
                        "releasedate date DEFAULT NULL, "
-                       "allowTriggers BOOLEAN NOT NULL DEFAULT FALSE, "
-                       "priority int(11) NOT NULL DEFAULT 1000, "
                        "PRIMARY KEY (id), "
                        "KEY mom2object_IND (mom2objectid) "
                        ") ENGINE=InnoDB AUTO_INCREMENT=149 DEFAULT CHARSET=latin1")
+        cursor.execute("ALTER TABLE project "
+                       "ADD allowtriggers BOOLEAN NOT NULL DEFAULT FALSE AFTER releasedate, "
+                       "ADD priority int(11) NOT NULL DEFAULT 1000 AFTER allowtriggers")
         # useradmin db
         cursor.execute("CREATE DATABASE useradministration")
         cursor.execute("CREATE TABLE useradministration.useraccount ( "