diff --git a/application/WorkerFlag/WorkerFlag.php b/application/WorkerFlag/WorkerFlag.php
index 849d2c6d0..4ef5fdacc 100644
--- a/application/WorkerFlag/WorkerFlag.php
+++ b/application/WorkerFlag/WorkerFlag.php
@@ -7,9 +7,9 @@ class WorkerFlag {
   private $name = null;
   private $value = null;
   private $user = null;
-
+  
   public function __construct($worker_id, $name) {
-    $this->db = new FronkDB();
+    $this->db = FronkDB::singleton();
   
     $user = new User($worker_id);
     $this->user = $user;
diff --git a/lib/mvcfronk/mfConfig/mfConfig.php b/lib/mvcfronk/mfConfig/mfConfig.php
index d0bc2250a..16b3e0182 100644
--- a/lib/mvcfronk/mfConfig/mfConfig.php
+++ b/lib/mvcfronk/mfConfig/mfConfig.php
@@ -14,7 +14,7 @@ class mfConfig {
   private $me;
 
   public function __construct($name) {
-    $this->db = new FronkDB();
+    $this->db = FronkDB::singleton();
 
     $name = $this->db->escape($name);
     $this->name = $name;
diff --git a/lib/mvcfronk/mfLogin/mfLoginController.php b/lib/mvcfronk/mfLogin/mfLoginController.php
index a04184faf..305eea751 100644
--- a/lib/mvcfronk/mfLogin/mfLoginController.php
+++ b/lib/mvcfronk/mfLogin/mfLoginController.php
@@ -118,7 +118,7 @@ class mfLoginController extends mfBaseController
 
     public static function isLoggedIn()
     {
-        $db = new FronkDB();
+        $db = FronkDB::singleton();
         if (!defined("MFAPPNAME")) define("MFAPPNAME", "mvcfronk");
         if (!defined("MFUSERTABLE")) define("MFUSERTABLE", "mfWorker");