diff --git a/addressfield_title.admin.inc b/addressfield_title.admin.inc
index 73a81f6..df9a12d 100644
--- a/addressfield_title.admin.inc
+++ b/addressfield_title.admin.inc
@@ -12,6 +12,12 @@
  */
 function addressfield_title_admin_form($form, &$form_state) {
   $form = array();
+  $form['addressfield_title_required'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Required'),
+    '#description' => t('Uncheck to make address field title optional'),
+    '#default_value' => variable_get('addressfield_title_required', TRUE),
+  );
   $form['addressfield_title_prefix'] = array(
     '#type' => 'textfield',
     '#title' => t('Title values'),
diff --git a/addressfield_title.module b/addressfield_title.module
index f68129d..29f5017 100644
--- a/addressfield_title.module
+++ b/addressfield_title.module
@@ -117,13 +117,15 @@ function addressfield_title_addressfield_types() {
 function _addressfield_title_render_address(&$format) {
   $address = $format['#address'];
 
-  $format['person_title'] = array(
-    '#title' => t('Title'),
-    '#tag' => 'span',
-    '#weight' => '-200',
-    '#children' => t(check_plain($address['person_title'])),
-    '#attributes' => array('class' => array('person-title')),
-  );
+  if (isset($address['person_title'])) {
+    $format['person_title'] = array(
+      '#title' => t('Title'),
+      '#tag' => 'span',
+      '#weight' => '-200',
+      '#children' => t(check_plain($address['person_title'])),
+      '#attributes' => array('class' => array('person-title')),
+    );
+  }
   return $format;
 }
 
diff --git a/plugins/format/title.inc b/plugins/format/title.inc
index 9155cc3..4489a21 100644
--- a/plugins/format/title.inc
+++ b/plugins/format/title.inc
@@ -31,7 +31,7 @@ function addressfield_format_title_generate(&$format, $address, $context = array
       '#empty_option' => t('Please choose'),
       '#options' => $prefixes,
       '#title' => t('Title'),
-      '#required' => TRUE,
+      '#required' => variable_get('addressfield_title_required', TRUE),
       '#tag' => 'span',
       '#attributes' => array('class' => array('person-title')),
       '#default_value' => isset($address['person_title']) ? $address['person_title'] : '',