diff --git a/phpgwapi/inc/class.Template.inc.php b/phpgwapi/inc/class.Template.inc.php
index 923c072cff..3bddc1fb29 100644
--- a/phpgwapi/inc/class.Template.inc.php
+++ b/phpgwapi/inc/class.Template.inc.php
@@ -334,7 +334,7 @@
 					break;
 			}
 			/* If they want NOGIF policy, then I do a global replace */
-			if ($GLOBALS['phpgw_info']['server']['imgtype_preference'] == 2)
+			if (PHPGW_IMGTYPE_PREF == 2)
 			{
 				$str = str_replace (".gif", ".png",$str);
 			}
diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php
index 5540d0f3ae..353ef51bce 100644
--- a/phpgwapi/inc/class.common.inc.php
+++ b/phpgwapi/inc/class.common.inc.php
@@ -776,7 +776,7 @@
 
 		function find_image($appname,$image)
 		{
-			switch($GLOBALS['phpgw_info']['server']['imgtype_preference'])
+			switch(PHPGW_IMGTYPE_PREF)
 			{
 				case 1:
 					$imgpref = Array('gif','jpg','png');