diff --git a/components/motd_wrapper.php b/components/motd_wrapper.php
index 602a148f4c997ade4cea8a943c49526fa61960be..84fd87267a665c4f378cbde6925e3bd3e1c93165 100644
--- a/components/motd_wrapper.php
+++ b/components/motd_wrapper.php
@@ -1,7 +1,4 @@
 <?PHP
 require("/var/www/sucssite/htdocs/settings.php");
-require("/usr/share/php/adodb/adodb.inc.php");
-
-$DB->SetCharSet('utf8');
 
 include($base."components/motd.php");
diff --git a/htdocs/index.php b/htdocs/index.php
index 1cdc92a6ddb050ed92fd56a568f5a1337036d4e1..d8fea5322206e26686bece2d52f269c946ea6659 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -41,11 +41,13 @@ $smarty->assign("baseurl", $baseurl);
 require("/usr/share/php/adodb/adodb.inc.php");
 $DB = NewADOConnection('postgres9');
 $DB->Connect('dbname='.$dbname.' user='.$dbuser);
+$DB->SetCharSet('utf8');
 $DB->SetFetchMode(ADODB_FETCH_ASSOC);
 
 // Initialise the sucs database conn
 $sucsDB = NewADOConnection('postgres9');
 $sucsDB->Connect('dbname='.$sucsdbname.' user='.$dbuser);
+$sucsDB->SetCharSet('utf8');
 $sucsDB->SetFetchMode(ADODB_FETCH_ASSOC);
 
 // Include the session library