--- sql_db.py   2015-09-24 12:36:43.460159055 +0200
+++ sql_db.py   2015-09-24 12:39:07.033330104 +0200
@@ -331,7 +331,7 @@
             self._cnx.leaked = True
         else:
             chosen_template = tools.config['db_template']
-            templates_list = tuple(set(['template0', 'template1', 'postgres', chosen_template]))
+            templates_list = tuple(set(['template0', 'template1', tools.config['db_name'], chosen_template]))
             keep_in_pool = self.dbname not in templates_list
             self.__pool.give_back(self._cnx, keep_in_pool=keep_in_pool)

@@ -617,6 +617,7 @@
 _Pool = None

 def db_connect(to, allow_uri=False):
+    to = to.replace('postgres', tools.config['db_name'])
     global _Pool
     if _Pool is None:
         _Pool = ConnectionPool(int(tools.config['db_maxconn']))