diff -urp workflow_ng\cclinks\cclinks.module workflow_ng_new\cclinks\cclinks.module
--- workflow_ng\cclinks\cclinks.module	Wed Mar 05 05:35:46 2008
+++ workflow_ng_new\cclinks\cclinks.module	Wed Apr 23 21:03:09 2008
@@ -216,14 +216,27 @@ function cclinks_event_info() {
 /*
  * Reacts on clicked links
  */
-function cclinks_link_click($event_name, $nid, $vid) {
+function cclinks_link_click($event_name) {
   $cclinks = cclinks_get_events();
   $settings = $cclinks[$event_name];
-  if ($node = node_load(intval($nid), intval($vid))) {
+
+  // Get node.
+  $args = func_get_args();
+  array_shift($args);
+  $nid = $args[0];
+  $node = is_int($args[1]) ? node_load(intval($nid), intval($args[1])) : node_load(intval($nid));
+
+  if ($node) {
     if (!$settings['schedule']) {
       cclink_schedule_event($node, $event_name, FALSE);
       cclink_toggle_label($node, $event_name);
-      drupal_goto();
+      if (!isset($_REQUEST['destination'])) {
+        // If destination is not selected, go to related node by default.
+        drupal_goto('node/'. $nid);
+      }
+      else {
+        drupal_goto();
+      }
     }
     else {
       //show form
diff -urp workflow_ng\cclinks\cclinks_admin.inc workflow_ng_new\cclinks\cclinks_admin.inc
--- workflow_ng\cclinks\cclinks_admin.inc	Sun Feb 10 16:58:58 2008
+++ workflow_ng_new\cclinks\cclinks_admin.inc	Wed Apr 23 16:31:19 2008
@@ -114,13 +114,13 @@ function cclinks_edit_form($event_name =
   $form['active'] = array(
     '#type' => 'checkbox',
     '#title' => t('Active'),
-    '#required' => TRUE,
+    '#required' => FALSE,
     '#default_value' => isset($settings['active']) ? $settings['active'] : 1,
   );
   $form['types'] = array(
     '#type' => 'select',
     '#title' => t('Content types'),
-    '#options' => node_get_types('names'),
+    '#options' => array_merge( '<not show>', node_get_types('names') ),
     '#multiple' => TRUE,
     '#required' => TRUE,
     '#default_value' => $settings['types'],
@@ -129,7 +129,7 @@ function cclinks_edit_form($event_name =
     '#type' => 'textfield',
     '#title' => t('Link label'),
     '#description' => t('The label of the link shown at the content.'),
-    '#required' => TRUE,
+    '#required' => FALSE,
     '#default_value' => $settings['link_label'],
   );
   $form['toggle_label'] = array(