diff --git a/addressbook/inc/functions.inc.php b/addressbook/inc/functions.inc.php
index 92714cc78a..b00ae75409 100755
--- a/addressbook/inc/functions.inc.php
+++ b/addressbook/inc/functions.inc.php
@@ -297,7 +297,12 @@
 		//$t->set_block('form','add','add');
 		//$t->set_block('form','edit','edit');
 
-		$countrylist  = $phpgw_info['server']['countrylist'];
+		if ( ($phpgw_info['server']['countrylist'] == 'user_choice' &&
+			$phpgw_info['user']['preferences']['common']['countrylist'] == 'use_select') ||
+			($phpgw_info['server']['countrylist'] == 'force_select'))
+		{
+			$countrylist  = True;
+		}
 
 		$email        = $fields['email'];
 		$emailtype    = $fields['email_type'];