diff --git a/scald_galleria/scald_galleria.module b/scald_galleria/scald_galleria.module
index 58e5483..2a073af 100644
--- a/scald_galleria/scald_galleria.module
+++ b/scald_galleria/scald_galleria.module
@@ -235,7 +235,18 @@ function scald_galleria_scald_prerender($atom, $context, $options, $mode) {
             $item_data = $atom->data['items'][$item['sid']];
             if (!empty($item_data['title_overriden'])) {
               $image['title'] = $item_data['title'];
+            } elseif (!empty($item_data['author_as_title'])) {
+              $authors = field_view_field('scald_atom', $item_atom, 'scald_authors', $display = array('label' => 'inline', 'type' => 'taxonomy_term_reference_plain'));
+              if (!empty($authors)) {
+                $image['title'] = render($authors);
+              }
+            } elseif (!empty($item_data['author_and_title'])) {
+              $authors = field_view_field('scald_atom', $item_atom, 'scald_authors', $display = array('label' => 'hidden', 'type' => 'taxonomy_term_reference_plain'));
+              if (!empty($authors)) {
+                $image['title'] .= ', ' . t('by') . render($authors);
+              }
             }
+
             $image['description'] = $item_data['description'];
           }
 
diff --git a/scald_gallery.module b/scald_gallery.module
index a2df472..9ec078a 100644
--- a/scald_gallery.module
+++ b/scald_gallery.module
@@ -119,6 +119,8 @@ function scald_gallery_field_widget_atom_reference_textfield_form_alter(&$elemen
     // New empty element.
     $data = array(
       'title_overriden' => 0,
+      'author_as_title' => 0,
+      'author_and_title' => 0,
       'title' => '',
       'description' => '',
     );
@@ -133,6 +135,18 @@ function scald_gallery_field_widget_atom_reference_textfield_form_alter(&$elemen
     '#default_value' => $data['title_overriden'],
     '#weight' => 20,
   );
+  $element['author_as_title'] = array(
+    '#title' => t('Display author instead of title'),
+    '#type' => 'checkbox',
+    '#default_value' => $data['author_as_title'],
+    '#weight' => 21,
+  );
+  $element['author_and_title'] = array(
+    '#title' => t('Display author and title'),
+    '#type' => 'checkbox',
+    '#default_value' => $data['author_and_title'],
+    '#weight' => 22,
+  );
 
   $langcode = !isset($context['langcode']) ? $context['langcode'] : LANGUAGE_NONE;
   $element['title'] = array(
@@ -181,6 +195,8 @@ function scald_gallery_submit_items(&$form, &$form_state) {
     }
     $atom->data['items'][$input['sid']] = array(
       'title_overriden' => $input['title_overriden'],
+      'author_as_title' => $input['author_as_title'],
+      'author_and_title' => $input['author_and_title'],
       'title' => $input['title'],
       'description' => $input['description'],
     );