Index: creativecommons.module
===================================================================
--- creativecommons.module	(revision 52)
+++ creativecommons.module	(working copy)
@@ -1945,19 +1949,45 @@
  * Save license/node relationship in database
  */
 function creativecommons_save($node, $op) {
+  global $user;
   
   // form submits data in creativecommons, while node_load stores it in cc
   if (isset($node->creativecommons)) {
     $cc_license_uri = $node->creativecommons['select_license_form']['cc_license_uri'];
     $metadata = $node->creativecommons['metadata'];
   }
-  else {
+  elseif (!empty($node->cc)) {
     $cc_license_uri = $node->cc->uri;
     $metadata = $node->cc->metadata;
   }
+  // Fallvack to the default user or site license
+  else {
+    // Retrieve the account of the node owner
+    if ($user->uid == $node->uid) {
+      $account = $user;
+    }
+    else {
+      $account = user_load(array('uid' => $node->uid));
+    }
+    // Test whether user has permissions to set his default license
+    if (user_access('use creative commons user defaults', $account)) {
+      $cc_license_uri = $account->cc->uri;
+      $metadata = $account->cc->metadata;
+    }
+    // Fallback to the default site license
+    elseif (creativecommons_node_type_is_enabled($node->type)) {
+      $default_license = creativecommons_get_default_license();
+      $cc_license_uri = $default_license->uri;
+      $metadata = $default_license->metadata;
+    }
+  }