diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php
index b489f7790f..2b504ddefd 100644
--- a/addressbook/inc/class.addressbook_ui.inc.php
+++ b/addressbook/inc/class.addressbook_ui.inc.php
@@ -1727,6 +1727,10 @@ class addressbook_ui extends addressbook_bo
 			$content['owner'] .= 'p';
 		}
 
+		// Prevent double countries - invalid code blanks it, disabling doesn't work
+		$content['adr_one_countrycode'] = '-';
+		$content['adr_two_countrycode'] = '-';
+
 		// Enable history
 		$this->setup_history($content, $sel_options);