diff --git a/filter/flickr_filter.module b/filter/flickr_filter.module
index ed7be56..f84155e 100644
--- a/filter/flickr_filter.module
+++ b/filter/flickr_filter.module
@@ -74,6 +74,7 @@ function flickr_filter_callback_photo($matches) {
   list($config, $attribs) = flickr_filter_split_config($matches[1]);
   if (isset($config['id'])) {
     if ($photo = flickr_photo_get_info($config['id'])) {
+if(!isset($config['size'])) $config['size']= variable_get('flickr_default_size', '-');
       return theme('flickr_filter_photo', array('photo' => $photo, 'size' => $config['size'], 'attribs' => $attribs));
     }
   }
diff --git a/flickr.admin.inc b/flickr.admin.inc
index 79e8c9c..15e80ff 100644
--- a/flickr.admin.inc
+++ b/flickr.admin.inc
@@ -53,8 +53,27 @@ function flickr_admin_settings() {
       '400' => t('400'),
       '500' => t('500'),
     ),
-    '#description' => t('The number indicates how many photos of a photoset display in your nodes. After saving the configuration, <a href="?q=admin/settings/performance">clear the cache</a>.'),
+    '#description' => t('The number indicates how many photos of a photoset display in your nodes. After saving the configuration, <a href="?q=admin/config/development/performance">clear the cache</a>.'),
   );
+  if (module_exists('flickr_filter')) {
+    $form['flickr_default_size'] = array(
+      '#type' => 'select',
+      '#title' => t('Default size'),
+      '#default_value' => variable_get('flickr_default_size', '-'),
+      '#options' => array(
+        's' => t('s: 75 px square'),
+        't' => t('t: 100 px on longest side'),
+        'q' => t('q: 150 px square'),
+        'm' => t('m: 240 px on longest side'),
+        'n' => t('n: 320 px on longest side (!)'),
+        '-' => t('-: 500 px on longest side'),
+        'z' => t('z: 640 px on longest side'),
+        'c' => t('c: 800 px on longest side (!)'),
+        'b' => t('b: 1024 px on longest side'),
+      ),
+      '#description' => t('A default Flickr size to use. This will be used when no size is specified, for example [flickr-photo:id=3711935987].<br />After saving the configuration, <a href="?q=admin/config/development/performance">clear the cache</a>.<br />!: TAKE CARE, n (320px) and c (800px) sizes are missing on many "older" Flickr images!'),
+    );
+  }
   $form['overlay_settings'] = array(
     '#type' => 'fieldset',
     '#title' => t('Overlay browser settings'),
@@ -123,4 +142,4 @@ function flickr_admin_settings_submit($form, &$form_state) {
 
   // ... and save the settings
   system_settings_form_submit($form, $form_state);
-}
+}
\ No newline at end of file