diff --git a/src/main/java/org/gcube/applicationsupportlayer/social/ApplicationNotificationsManager.java b/src/main/java/org/gcube/applicationsupportlayer/social/ApplicationNotificationsManager.java
index 3a40a69..2937d72 100644
--- a/src/main/java/org/gcube/applicationsupportlayer/social/ApplicationNotificationsManager.java
+++ b/src/main/java/org/gcube/applicationsupportlayer/social/ApplicationNotificationsManager.java
@@ -94,9 +94,14 @@ public class ApplicationNotificationsManager extends SocialPortalBridge implemen
 	 * @return .
 	 */
 	private String getApplicationUrl() {
-		if (applicationProfile != null && applicationProfile.getUrl() != null)
-			return applicationProfile.getUrl();
-		else return "";
+		if (applicationProfile != null && applicationProfile.getUrl() != null) {
+			_log.trace("getApplicationUrl="+applicationProfile.getUrl());
+			return applicationProfile.getUrl();			
+		}
+		else {
+			_log.warn("applicationProfile NULL or url is empty");
+			return "";
+		}
 	}
 	/**
 	 * {@inheritDoc}
diff --git a/src/main/java/org/gcube/applicationsupportlayer/social/mailing/EmailPlugin.java b/src/main/java/org/gcube/applicationsupportlayer/social/mailing/EmailPlugin.java
index fe0725f..76fff0d 100644
--- a/src/main/java/org/gcube/applicationsupportlayer/social/mailing/EmailPlugin.java
+++ b/src/main/java/org/gcube/applicationsupportlayer/social/mailing/EmailPlugin.java
@@ -249,6 +249,15 @@ public class EmailPlugin {
 		case DOCUMENT_WORKFLOW_FORWARD_STEP_COMPLETED_OWNER:
 			actionLink.append("\">.").append(" Go to Document Workflow Manager").append("</a>");
 			break;
+		case CALENDAR_ADDED_EVENT:
+			actionLink.append("\">.").append(" Go to Calendar").append("</a>");
+			break;
+		case CALENDAR_UPDATED_EVENT:
+			actionLink.append("\">.").append(" Go to Calendar").append("</a>");
+			break;
+		case CALENDAR_DELETED_EVENT:
+			actionLink.append("\">.").append(" Go to Calendar").append("</a>");
+			break;
 		default:
 			actionLink.append("\">.").append("").append("</a>");
 			break;