diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php
index 56be05c193..5feb286dfe 100644
--- a/addressbook/inc/class.addressbook_ui.inc.php
+++ b/addressbook/inc/class.addressbook_ui.inc.php
@@ -323,7 +323,11 @@ class addressbook_ui extends addressbook_bo
 		}
 		// get the availible org-views plus the label of the contacts view of one org
 		$sel_options['org_view'] = $this->org_views;
-		if (isset($org_view)) $content['nm']['org_view'] = $org_view;
+		if (isset($org_view))
+		{
+			$content['nm']['org_view'] = $org_view;
+			$content['nm']['default_cols'] = '';
+		}
 
 		$content['nm']['actions'] = $this->get_actions($content['nm']['col_filter']['tid'], $content['nm']['org_view']);
 
diff --git a/addressbook/templates/default/index.org_rows.xet b/addressbook/templates/default/index.org_rows.xet
index ff4fc5cf0e..1df0b29d7d 100644
--- a/addressbook/templates/default/index.org_rows.xet
+++ b/addressbook/templates/default/index.org_rows.xet
@@ -25,13 +25,17 @@
 					<description id="${row}[org_name]" no_lang="1"/>
 					<description id="${row}[org_unit]" no_lang="1"/>
 					<vbox options="0,0">
-						<description id="${row}[adr_one_countryname]" no_lang="1"/>
-						<hbox options="0,0" orient="0">
-							<description no_lang="1" id="${row}[adr_one_locality]"/>
-							<description id="${row}[adr_one_postalcode]" class="leftPad5" value=" " no_lang="1"/>
-						</hbox>
-						<description no_lang="1" id="${row}[adr_one_street]"/>
+						<description id="${row}[adr_one_street]" no_lang="1"/>
 						<description id="${row}[adr_one_street2]" no_lang="1"/>
+						<hbox options="0,0" orient="0">
+							<description id="${row}[adr_one_postalcode]" no_lang="1"/>
+							<description value=" " id="${row}[adr_one_locality]" no_lang="1" class="leftPad5"/>
+							<description id="${row}[adr_one_region]" no_lang="1" class="leftPad5"/>
+						</hbox>
+						<description id="${row}[adr_one_countryname]" no_lang="1"/>
+						<menulist>
+							<menupopup type="select-country" id="${row}[adr_one_countrycode]" readonly="true"/>
+						</menulist>
 					</vbox>
 				</row>
 			</rows>