Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r60dd4bbd334d67e6ced927859c35ca83720db776 -rf0a07161503850e9dcdb4b69b4a37be03744743b
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 60dd4bbd334d67e6ced927859c35ca83720db776)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision f0a07161503850e9dcdb4b69b4a37be03744743b)
@@ -626,6 +626,7 @@
 config.smtp.port  =SMTP port
 config.smtp.auth.security  =SMTP authentication security
 config.server.country  =Country
+admin.outcome.title =Outcomes management
 
 
 #======= End labels: Exported 620 labels for en AU =====
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java
===================================================================
diff -u -r4c134bb552fd30a24e610ddd532846ec38a3a51c -rf0a07161503850e9dcdb4b69b4a37be03744743b
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java	(.../SysAdminStartAction.java)	(revision 4c134bb552fd30a24e610ddd532846ec38a3a51c)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java	(.../SysAdminStartAction.java)	(revision f0a07161503850e9dcdb4b69b4a37be03744743b)
@@ -64,6 +64,7 @@
 	    links.add(new LinkBean("ltiConsumerManagement.do", "label.manage.tool.consumers"));
 	    links.add(new LinkBean("policyManagement.do?method=list", "admin.policies.title"));
 	    links.add(new LinkBean("toolcontentlist.do", "sysadmin.tool.management"));
+	    links.add(new LinkBean("../outcome.do?method=outcomeManage", "admin.outcome.title"));
 	    links.add(new LinkBean("themeManagement.do", "admin.themes.title"));
 	    links.add(new LinkBean("sessionmaintain.do?method=list", "sysadmin.maintain.session"));
 	    groupedLinks.add(new Object[]{AdminConstants.START_CONFIG_LINKS,links});
Index: lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java
===================================================================
diff -u -r313e29d4010a35282a7c56dd24971e40b442dfb0 -rf0a07161503850e9dcdb4b69b4a37be03744743b
--- lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java	(.../OutcomeAction.java)	(revision 313e29d4010a35282a7c56dd24971e40b442dfb0)
+++ lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java	(.../OutcomeAction.java)	(revision f0a07161503850e9dcdb4b69b4a37be03744743b)
@@ -110,18 +110,12 @@
 	    }
 	}
 
-	if (organisationId == null) {
-	    if (!getSecurityService().isSysadmin(userId, "add/edit global outcome", false)) {
-		response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a sysadmin");
-		return null;
-	    }
-	} else {
-	    if (!getSecurityService().hasOrgRole(organisationId, userId, new String[] { Role.AUTHOR },
-		    "add/edit course outcome", false)) {
-		response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not an author in the organisation");
-		return null;
-	    }
+	if (organisationId != null && !getSecurityService().hasOrgRole(organisationId, userId,
+		new String[] { Role.AUTHOR }, "add/edit course outcome", false)) {
+	    response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not an author in the organisation");
+	    return null;
 	}
+
 	OutcomeForm outcomeForm = (OutcomeForm) form;
 	outcomeForm.setOrganisationId(organisationId);
 	outcomeForm.setContentFolderId(getOutcomeService().getContentFolderId(organisationId));
@@ -216,7 +210,8 @@
 	if (outcome == null) {
 	    throw new IllegalArgumentException("Can not find an outcome with ID " + outcomeId);
 	}
-	Integer organisationId = outcome.getOrganisation().getOrganisationId();
+	Integer organisationId = outcome.getOrganisation() == null ? null
+		: outcome.getOrganisation().getOrganisationId();
 	Integer userId = getUserDTO().getUserID();
 
 	if (organisationId == null) {
Index: lams_central/web/outcome/outcomeEdit.jsp
===================================================================
diff -u -r313e29d4010a35282a7c56dd24971e40b442dfb0 -rf0a07161503850e9dcdb4b69b4a37be03744743b
--- lams_central/web/outcome/outcomeEdit.jsp	(.../outcomeEdit.jsp)	(revision 313e29d4010a35282a7c56dd24971e40b442dfb0)
+++ lams_central/web/outcome/outcomeEdit.jsp	(.../outcomeEdit.jsp)	(revision f0a07161503850e9dcdb4b69b4a37be03744743b)
@@ -21,8 +21,13 @@
 	<script type="text/javascript">
 		<c:if test="${saved}">
 			var outcomesFrame = $('#dialogOutcome iframe', window.parent.document);
-			outcomesFrame.attr('src', outcomesFrame.attr('src'));
-	       	window.parent.closeDialog('dialogOutcomeEdit');
+			if (outcomesFrame.length == 0) {
+				window.parent.document.location.href = 
+					'<lams:LAMSURL/>outcome.do?method=outcomeManage${empty param.organisationID ? "" : "&organisationID=param.organisationID"}';
+			} else {
+				outcomesFrame.attr('src', outcomesFrame.attr('src'));
+	       		window.parent.closeDialog('dialogOutcomeEdit');
+			}
 		</c:if>
 		
 		var organisationId = '${param.organisationID}',
@@ -117,13 +122,12 @@
 				</div>
 			</div>
 		</div>
+		<c:if test="${not formDisabled}">
+			<button id="addOutcomeButton" type="submit" class="btn btn-primary" onClick="javascript:submitOutcome()">
+				<fmt:message key="outcome.manage.add.save" />
+			</button>
+		</c:if>
 	</div>
-	
-	<c:if test="${not formDisabled}">
-		<button id="addOutcomeButton" type="submit" class="btn btn-primary" onClick="javascript:submitOutcome()">
-			<fmt:message key="outcome.manage.add.save" />
-		</button>
-	</c:if>
 </html:form>
 </body>
 </lams:html>
\ No newline at end of file
Index: lams_central/web/outcome/outcomeManage.jsp
===================================================================
diff -u -r7d7e4420720fa2caa466d0faa33f8a810c72af45 -rf0a07161503850e9dcdb4b69b4a37be03744743b
--- lams_central/web/outcome/outcomeManage.jsp	(.../outcomeManage.jsp)	(revision 7d7e4420720fa2caa466d0faa33f8a810c72af45)
+++ lams_central/web/outcome/outcomeManage.jsp	(.../outcomeManage.jsp)	(revision f0a07161503850e9dcdb4b69b4a37be03744743b)
@@ -86,12 +86,10 @@
 			</div>
 		</div>
 	</c:forEach>
+	<div id="addOutcomeButton" class="btn btn-primary" onClick="javascript:openEditOutcomeDialog()">
+		<i class="fa fa-plus"></i>
+		<span><fmt:message key='outcome.manage.add' /></span>
+	</div>
 </div>
-
-<div id="addOutcomeButton" class="btn btn-primary" onClick="javascript:openEditOutcomeDialog()">
-	<i class="fa fa-plus"></i>
-	<span><fmt:message key='outcome.manage.add' /></span>
-</div>
-
 </body>
 </lams:html>
\ No newline at end of file