diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php
index 16d37e9c453..f33be20ba62 100644
--- a/htdocs/comm/action/fiche.php
+++ b/htdocs/comm/action/fiche.php
@@ -77,8 +77,10 @@ $hookmanager->initHooks(array('actioncard'));
 
 
 /*
- * Action creation de l'action
+ * Actions
  */
+
+// Add action
 if ($action == 'add_action')
 {
 	$error=0;
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 7facb9b5459..5e38198ab60 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -84,7 +84,7 @@ $type=GETPOST("type");
 $maxprint=(isset($_GET["maxprint"])?GETPOST("maxprint"):$conf->global->AGENDA_MAX_EVENTS_DAY_VIEW);
 $actioncode=GETPOST("actioncode","alpha",3)?GETPOST("actioncode","alpha",3):(GETPOST("actioncode")=="0"?'':(empty($conf->global->AGENDA_USE_EVENT_TYPE)?'AC_OTH':''));
 
-if (GETPOST('viewcal'))  {
+if (GETPOST('viewcal') && $action != 'show_day' && $action != 'show_week')  {
     $action='show_month'; $day='';
 }                                                   // View by month
 if (GETPOST('viewweek')) {
@@ -1140,7 +1140,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                                 $cachethirdparties[$event->societe->id]=$thirdparty;
                             }
                             else $thirdparty=$cachethirdparties[$event->societe->id];
-                            $linerelatedto.=$thirdparty->getNomUrl(1,'',$length);
+                            if (! empty($thirdparty->id)) $linerelatedto.=$thirdparty->getNomUrl(1,'',$length);
                         }
                         if (! empty($event->contact->id) && $event->contact->id > 0)
                         {
@@ -1152,7 +1152,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                             }
                             else $contact=$cachecontacts[$event->contact->id];
                             if ($linerelatedto) $linerelatedto.=' / ';
-                            $linerelatedto.=$contact->getNomUrl(1,'',$length);
+                            if (! empty($contact->id)) $linerelatedto.=$contact->getNomUrl(1,'',$length);
                         }
                         if ($linerelatedto) print '<br>'.$linerelatedto;
                     }