diff --git a/sites/all/modules/creativecommons_lite/creativecommons_lite.module b/sites/all/modules/creativecommons_lite/creativecommons_lite.module
index b1b7839..5c22dc2 100644
--- a/sites/all/modules/creativecommons_lite/creativecommons_lite.module
+++ b/sites/all/modules/creativecommons_lite/creativecommons_lite.module
@@ -195,16 +195,30 @@ function creativecommons_lite_form($node) {
     '#tree' => TRUE,
   );
   
-  $form['creativecommons_lite'][] = array('#value'=>$description);
   
-  $form['creativecommons_lite']['cclite_select_license_form']['cc_lite_license'] = array(
-    '#type' => 'select',
-    '#tree'=> FALSE,
-    '#title' => t('Select a license'),
-    '#default_value' => $node->cc_lite_license,
-    '#options' => $types,
-    '#required' => variable_get('creativecommons_lite_mandatory', false),
-  );
+  if (count($types) > 1) {
+    $form['creativecommons_lite'][] = array('#value'=>$description);
+    $form['creativecommons_lite']['cclite_select_license_form']['cc_lite_license'] = array(
+      '#type' => 'select',
+      '#tree'=> FALSE,
+      '#title' => t('Select a license'),
+      '#default_value' => $node->cc_lite_license,
+      '#options' => $types,
+      '#required' => variable_get('creativecommons_lite_mandatory', false),
+    );
+  } 
+  else {
+    $form['creativecommons_lite']['cclite_select_license_form']['cc_lite_license'] = array(
+      '#type' => 'hidden',
+      '#tree'=> FALSE,
+      '#value' => $node->cc_lite_license,
+      // To only have 1 type, license must be mandatory
+      '#required' => TRUE,
+    );
+    $form['creativecommons_lite']['cclite_select_license_form']['cc_lite_license_html'] = array(
+      '#value' => get_license_html($node->cc_lite_license),
+    );
+  }
   
   return $form;
 }
@@ -235,10 +249,10 @@ function get_license_html($license) {
   }
   
   if (!variable_get('creativecommons_lite_no_text', 0)) {
-    $html .= t('This work is licensed under a') .
+    $html .= "<span>" . t('This work is licensed under a') .
             ' ' . l($license_info['license_name'] .
             ' ' . t('Creative Commons license'), $license_info['license_uri'], array('attributes' => array('rel' => 'license'))) .
-            "<br />\n";
+            "<br /></span>\n";
   }
   
   $html .= "<!--/Creative Commons License-->\n";
@@ -311,8 +325,10 @@ function creativecommons_lite_get_license_array($options = NULL) {
     $types = array_intersect_key($types, $options);
   }
   
-  // Add an empty option to the beginning of the types
-  $types = array_merge(array('' => ''), $types);
+  if (!variable_get('creativecommons_lite_mandatory', 0)) {
+    // Add an empty option to the beginning of the types
+    $types = array_merge(array('' => ''), $types);
+  }
   
   return $types;
 }