Index: lams_central/web/includes/javascript/authoring/authoringActivity.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/authoring/authoringActivity.js,v
diff -u -r1.38.2.36 -r1.38.2.37
--- lams_central/web/includes/javascript/authoring/authoringActivity.js	29 Mar 2017 05:07:56 -0000	1.38.2.36
+++ lams_central/web/includes/javascript/authoring/authoringActivity.js	1 Apr 2017 08:22:52 -0000	1.38.2.37
@@ -247,7 +247,8 @@
 	/**
 	 * Constructor for a Tool Activity.
 	 */
-	ToolActivity : function(id, uiid, toolContentID, toolID, learningLibraryID, authorURL, x, y, title, readOnly) {
+	ToolActivity : function(id, uiid, toolContentID, toolID, learningLibraryID, authorURL, x, y, title,
+							readOnly, gradebookToolOutputDefinitionName) {
 		this.id = +id || null;
 		this.uiid = +uiid || ++layout.ld.maxUIID;
 		this.toolContentID = toolContentID;
@@ -256,6 +257,7 @@
 		this.authorURL = authorURL;
 		this.title = title;
 		this.readOnly = readOnly;
+		this.gradebookToolOutputDefinitionName = gradebookToolOutputDefinitionName;
 		this.transitions = {
 			'from' : [],
 			'to'   : []
@@ -1299,12 +1301,14 @@
 			dataType : 'json',
 			success : function(response) {
 				activity.outputDefinitions = response;
-				$.each(activity.outputDefinitions, function() {
-					if (this.isDefaultGradebookMark){
-						activity.gradebookToolOutputDefinitionName = this.name;
-					return false;
-				}
+				if (!activity.gradebookToolOutputDefinitionName) {
+					$.each(activity.outputDefinitions, function() {
+						if (this.isDefaultGradebookMark){
+							activity.gradebookToolOutputDefinitionName = this.name;
+							return false;
+							}
 					});
+				}
 		}
 		});
 	},
@@ -1652,4 +1656,4 @@
 		
 		branchingActivity.longestBranchLength = longestBranchLength;
 	}
-};
+};
\ No newline at end of file
Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/authoring/authoringGeneral.js,v
diff -u -r1.51.2.68 -r1.51.2.69
--- lams_central/web/includes/javascript/authoring/authoringGeneral.js	28 Mar 2017 06:47:37 -0000	1.51.2.68
+++ lams_central/web/includes/javascript/authoring/authoringGeneral.js	1 Apr 2017 08:22:52 -0000	1.51.2.69
@@ -1510,7 +1510,9 @@
 											activityData.xCoord ? activityData.xCoord : 1,
 											activityData.yCoord ? activityData.yCoord : 1,
 											activityData.activityTitle,
-											activityData.readOnly);
+											activityData.readOnly,
+											activityData.activityEvaluations.length > 0
+												? activityData.activityEvaluations[0] : "<NONE>");
 							// for later reference
 							activityData.activity = activity;
 							break;