diff --git a/addressfield.module b/addressfield.module
index 55b8c05..7e6c0e1 100644
--- a/addressfield.module
+++ b/addressfield.module
@@ -247,6 +247,8 @@ function addressfield_field_widget_settings_form($field, $instance) {
         'first_last' => t('First and last name text fields'),
         'name_line_organisation' => t('Full name text field with an optional company text field'),
         'first_last_organisation' => t('First and last name textfields with an optional company text field'),
+        'only_organisation' => t('Only show a field for a company name'),
+        'no_name_organization' => t('No name or organisation name'),
       ),
       '#default_value' => $settings['name_format'],
     );
@@ -452,7 +454,7 @@ function addressfield_standard_xnl_form($address, $field, $instance, $langcode,
     );
   }
 
-  if (strpos($format, 'organisation')) {
+  if (strpos($format, 'first_last_organisation')) {
     $form['organisation_name'] = array(
       '#title' => t('Company'),
       '#type' => 'textfield',
@@ -460,6 +462,15 @@ function addressfield_standard_xnl_form($address, $field, $instance, $langcode,
       '#default_value' => $address['organisation_name'],
     );
   }
+  
+  if (strpos($format, 'only_organisation') === 0) {
+    $form['organisation_name'] = array(
+      '#title' => t('Company'),
+      '#type' => 'textfield',
+      '#size' => 30,
+      '#default_value' => $address['organisation_name'],
+    );    
+  }
 
   return $form;
 }
@@ -685,6 +696,13 @@ function addressfield_field_formatter_view($entity_type, $entity, $field, $insta
             ));
           }
         }
+        elseif (strpos($format, 'only_organisation') === 0) {
+          if ($settings['organisation'] && !empty($item['organisation_name'])) {
+            $xnl_name = t('@organisation_name' . 'asdfasd', array(
+              '@organisation_name' => $item['organisation_name']
+            ));
+          }  
+        }
 
         $element[$delta] = array(
           '#markup' => !empty($xnl_name) ? $xnl_name : t('No name'),