Index: assignment-tool/tool/src/java/org/sakaiproject/assignment/entityproviders/AssignmentEntityProvider.java
===================================================================
--- assignment-tool/tool/src/java/org/sakaiproject/assignment/entityproviders/AssignmentEntityProvider.java	(revision 248)
+++ assignment-tool/tool/src/java/org/sakaiproject/assignment/entityproviders/AssignmentEntityProvider.java	(working copy)
@@ -781,7 +781,7 @@
 	public Map<String, String> getProperties(String reference) {
 		Map<String, String> props = new HashMap<String, String>();
 		String parsedRef = reference;
-		String defaultView = "doView_submission";
+		String defaultView = "doView_submission_evap";
 		String[] refParts = reference.split(Entity.SEPARATOR);
 		String submissionId = "null"; // setting to the string null
 		String decWrapper = null;
@@ -917,11 +917,13 @@
 					props.put("submissionAttachmentRefs",
 							refs.substring(0, refs.lastIndexOf(":::")));
 				}
-
+/*
 				props.put("url", "/portal/tool/" + placement + "?assignmentId="
 						+ assignment.getId() + "&submissionId=" + submissionId
 						+ "&assignmentReference=" + assignment.getReference()
 						+ "&panel=Main&sakai_action=" + defaultView);
+*/
+				props.put("url", "/portal/tool/" + placement + "?assignmentReference=" + assignment.getReference() + "&panel=Main&sakai_action=doView_submission_evap");
 			}
 		} catch (IdUnusedException e) {
 			throw new EntityNotFoundException("No assignment found", reference,
Index: assignment-tool/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java
===================================================================
--- assignment-tool/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java	(revision 248)
+++ assignment-tool/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java	(working copy)
@@ -946,7 +946,7 @@
 		context.put("enableViewOption", ServerConfigurationService.getBoolean("assignment.enableViewOption", true));
 		
 		String mode = (String) state.getAttribute(STATE_MODE);
-
+//		System.out.println("Assignment mode is:"+mode);
 		if (!MODE_LIST_ASSIGNMENTS.equals(mode))
 		{
 			// allow grade assignment?
@@ -1364,7 +1364,8 @@
 		String invokedByStatus = (String) state.getAttribute(INVOKE);
 		if(invokedByStatus!=null){
 			if(invokedByStatus.equalsIgnoreCase(INVOKE_BY_LINK)){
-				context.put("linkInvoked", Boolean.valueOf(true));	
+				context.put("linkInvoked", Boolean.valueOf(true));
+				state.setAttribute(STATE_MODE, MODE_STUDENT_VIEW_SUBMISSION);
 			}else{
 				context.put("linkInvoked", Boolean.valueOf(false));
 			}