diff --git a/.classpath b/.classpath
index e003a06..030fc28 100644
--- a/.classpath
+++ b/.classpath
@@ -20,16 +20,16 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
-		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="output" path="target/notifications-0.1.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/SingleNotificationView.java b/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/SingleNotificationView.java
index 9b5fb6c..eb48354 100644
--- a/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/SingleNotificationView.java
+++ b/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/SingleNotificationView.java
@@ -70,10 +70,13 @@ public class SingleNotificationView extends Composite {
 			goApp.setHTML("<a class=\"link\" href=\""+toShow.getUri()+"\"> See this Document Workflow.</a>");
 			break;
 		case DOCUMENT_WORKFLOW_VIEW:
-			goApp.setHTML("<a class=\"link\" href=\""+toShow.getUri()+"\"> See User Activity.</a>");
+			goApp.setHTML("<a class=\"link\" href=\""+toShow.getUri()+"\"> See Users Activity.</a>");
 			break;
 		case DOCUMENT_WORKFLOW_EDIT:
-			goApp.setHTML("<a class=\"link\" href=\""+toShow.getUri()+"\"> See User Activity.</a>");
+			goApp.setHTML("<a class=\"link\" href=\""+toShow.getUri()+"\"> See Users Activity.</a>");
+			break;
+		case DOCUMENT_WORKFLOW_FORWARD_STEP_COMPLETED_OWNER:
+			goApp.setHTML("<a class=\"link\" href=\""+toShow.getUri()+"\"> See Users Activity.</a>");
 			break;
 		}
 	}
@@ -112,10 +115,12 @@ public class SingleNotificationView extends Composite {
 			return images.documentWorkflow();
 		case DOCUMENT_WORKFLOW_STEP_REQUEST_TASK:
 			return images.documentWorkflow();
-		case DOCUMENT_WORKFLOW_STEP_FORWARD_OWNER:
+		case DOCUMENT_WORKFLOW_USER_FORWARD_TO_OWNER:
 			return images.workflowForward();
 		case DOCUMENT_WORKFLOW_STEP_FORWARD_PEER:
 			return images.workflowForward();
+		case DOCUMENT_WORKFLOW_FORWARD_STEP_COMPLETED_OWNER:
+			return images.workflowForwardComplete();
 		default:
 			return images.generic();
 		}
diff --git a/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/images/NotificationImages.java b/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/images/NotificationImages.java
index 0f19eac..796848d 100644
--- a/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/images/NotificationImages.java
+++ b/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/images/NotificationImages.java
@@ -31,6 +31,9 @@ public interface NotificationImages extends ClientBundle {
 	@Source("workflow-forward.png")
 	ImageResource workflowForward();
 	
+	@Source("workflow-forward-complete.jpg")
+	ImageResource workflowForwardComplete();
+	
 	@Source("notification-generic.png")
 	ImageResource generic();
 }
diff --git a/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/images/workflow-forward-complete.jpg b/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/images/workflow-forward-complete.jpg
new file mode 100644
index 0000000..f5a16de
Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/images/workflow-forward-complete.jpg differ
diff --git a/src/main/java/org/gcube/portlets/user/notifications/server/NotificationsServiceImpl.java b/src/main/java/org/gcube/portlets/user/notifications/server/NotificationsServiceImpl.java
index 508cc1c..9ce5d6f 100644
--- a/src/main/java/org/gcube/portlets/user/notifications/server/NotificationsServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/notifications/server/NotificationsServiceImpl.java
@@ -59,7 +59,7 @@ public class NotificationsServiceImpl extends RemoteServiceServlet implements No
 		String user = (String) this.getThreadLocalRequest().getSession().getAttribute(ScopeHelper.USERNAME_ATTRIBUTE);
 		if (user == null) {
 			//user = "test.user";
-			user = "pasquale.pagano";
+			user = "luca.frosini";
 			
 			_log.warn("USER IS NULL setting "+user+" and Running OUTSIDE PORTAL");
 			withinPortal = false;