Index: lams_central/web/errorpages/error.jsp
===================================================================
diff -u -r1d797a122973488f0a007957b73a4c680a7eb932 -r245131a647fbf7add783dd2fc9c9bf82322530a9
--- lams_central/web/errorpages/error.jsp	(.../error.jsp)	(revision 1d797a122973488f0a007957b73a4c680a7eb932)
+++ lams_central/web/errorpages/error.jsp	(.../error.jsp)	(revision 245131a647fbf7add783dd2fc9c9bf82322530a9)
@@ -10,24 +10,23 @@
 <lams:head>
 	<title><fmt:message key="heading.general.error" /></title>
 	<lams:css />
-	<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
 	<script type="text/javascript">
 		function closeWin() {
 			window.close();
 		}
 		<c:if test="${showErrorStack1}">
-		function showHide() {
-			var messageDetail = document.getElementById('messageDetail'),
-				showButt = document.getElementById('showButt');
-			if (messageDetail.style.display == 'none') {
-				showButt.innerHTML = "<fmt:message key='msg.hide.detail'/>";
-				messageDetail.style.display = 'inline';
+			function showHide() {
+				var messageDetail = document.getElementById('messageDetail'),
+					showButt = document.getElementById('showButt');
+				if (messageDetail.style.display == 'none') {
+					showButt.innerHTML = "<fmt:message key='msg.hide.detail'/>";
+					messageDetail.style.display = 'inline';
 
-			} else {
-				showButt.innerHTML = "<fmt:message key='msg.show.detail'/>";
-				messageDetail.style.display = 'none';
+				} else {
+					showButt.innerHTML = "<fmt:message key='msg.show.detail'/>";
+					messageDetail.style.display = 'none';
+				}
 			}
-		}
 		</c:if>
 	</script>
 </lams:head>
@@ -55,7 +54,7 @@
 				<c:if test="${not empty param.errorName}">
 
 					<c:out value="${param.errorName}" escapeXml="true" />:
-						<c:out value="${param.errorMessage}" escapeXml="true" />
+					<c:out value="${param.errorMessage}" escapeXml="true" />
 
 
 
@@ -83,4 +82,4 @@
 		<!--closes footer-->
 	</lams:Page>
 </body>
-</lams:html>
+</lams:html>
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20221118.sql
===================================================================
diff -u -r4a4cc47d39a40b20a68777732e2de7cf9e466feb -r245131a647fbf7add783dd2fc9c9bf82322530a9
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20221118.sql	(.../patch20221118.sql)	(revision 4a4cc47d39a40b20a68777732e2de7cf9e466feb)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20221118.sql	(.../patch20221118.sql)	(revision 245131a647fbf7add783dd2fc9c9bf82322530a9)
@@ -3,7 +3,7 @@
 SET FOREIGN_KEY_CHECKS=0;
 -- Put all sql statements below here
 
---LDEV-5302 Rename SYSADMIN to APPADMIN, add new SYSADMIN role
+-- LDEV-5302 Rename SYSADMIN to APPADMIN, add new SYSADMIN role
 								   
 UPDATE lams_role SET name = 'APPADMIN', description = 'LAMS Application Adminstrator' WHERE name = 'SYSADMIN';
 
@@ -16,4 +16,4 @@
 -- If there were no errors, commit and restore autocommit to on
 COMMIT;
 SET AUTOCOMMIT = 1;
-SET FOREIGN_KEY_CHECKS=1;
+SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
===================================================================
diff -u -r5bc88174180046cd153cfc46a0c8ef13675bd4bf -r245131a647fbf7add783dd2fc9c9bf82322530a9
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision 5bc88174180046cd153cfc46a0c8ef13675bd4bf)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision 245131a647fbf7add783dd2fc9c9bf82322530a9)
@@ -956,6 +956,9 @@
 
     @Override
     public boolean isUserAppAdmin() {
+	if (isUserSysAdmin()) {
+	    return true;
+	}
 	Integer rootOrgId = getRootOrganisation().getOrganisationId();
 	Integer requestorId = getRequestorId();
 	return requestorId != null ? isUserInRole(requestorId, rootOrgId, Role.APPADMIN) : false;