Index: lams_admin/web/remove.jsp
===================================================================
diff -u -r547ae2750f9034789816b26cf222421f5c5c155d -r3023b95752efbf47524041602e4046529108f950
--- lams_admin/web/remove.jsp	(.../remove.jsp)	(revision 547ae2750f9034789816b26cf222421f5c5c155d)
+++ lams_admin/web/remove.jsp	(.../remove.jsp)	(revision 3023b95752efbf47524041602e4046529108f950)
@@ -6,6 +6,16 @@
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 
 <form>
+
+<logic:empty name="orgId">
+	<c:url var="cancel" value="usersearch.do" />
+</logic:empty>
+<logic:notEmpty name="orgId">
+	<c:url var="cancel" value="usermanage.do">
+		<c:param name="org" value="${orgId}" />
+	</c:url>
+</logic:notEmpty>
+
 <logic:equal name="method" value="disable">
 <h2><fmt:message key="admin.user.disable"/></h2>
 <p>&nbsp;</p>
@@ -21,7 +31,7 @@
 	</c:url>
 <div style="float:right">
 <input type="button" value="Disable" onClick="javascript:document.location='<c:out value="${disableaction}"/>'" />
-<input type="button" value="Cancel" onClick="javascript:document.location='usermanage.do?org=<c:out value="${orgId}" />'" />
+<input type="button" value="Cancel" onClick="javascript:document.location='<c:out value="${cancel}"/>'" />
 </div>
 </logic:equal>
 
@@ -36,7 +46,7 @@
 	</c:url>
 <div style="float:right">
 <input type="button" value="Delete" onClick="javascript:document.location='<c:out value="${deleteaction}"/>'" />
-<input type="button" value="Cancel" onClick="javascript:document.location='usermanage.do?org=<c:out value="${orgId}" />'" />
+<input type="button" value="Cancel" onClick="javascript:document.location='<c:out value="${cancel}"/>'" />
 </div>
 </logic:equal>
 </form>
\ No newline at end of file