Index: idea_project/.idea/codeStyles/Project.xml
===================================================================
diff -u -r10ada76a9a401c0fb4842e107613be3ffcc8430b -r79f5d06324fa18a32a2d65cf0decd640fb2261a6
--- idea_project/.idea/codeStyles/Project.xml	(.../Project.xml)	(revision 10ada76a9a401c0fb4842e107613be3ffcc8430b)
+++ idea_project/.idea/codeStyles/Project.xml	(.../Project.xml)	(revision 79f5d06324fa18a32a2d65cf0decd640fb2261a6)
@@ -3,6 +3,8 @@
     <option name="FORMATTER_TAGS_ENABLED" value="true" />
     <JavaCodeStyleSettings>
       <option name="SPACE_AFTER_CLOSING_ANGLE_BRACKET_IN_TYPE_ARGUMENT" value="true" />
+      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="100" />
+      <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="100" />
       <option name="ALIGN_MULTILINE_RECORDS" value="false" />
       <option name="ALIGN_TYPES_IN_MULTI_CATCH" value="false" />
       <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
Index: lams_tool_zoom/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r97b9227e4f759db2510bc57ef24be3a3ef714bfc -r79f5d06324fa18a32a2d65cf0decd640fb2261a6
--- lams_tool_zoom/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 97b9227e4f759db2510bc57ef24be3a3ef714bfc)
+++ lams_tool_zoom/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 79f5d06324fa18a32a2d65cf0decd640fb2261a6)
@@ -52,18 +52,19 @@
 message.monitoring.summary.no.session = No session available
 label.activity.completion = End of Activity
 label.api.email = Email
-label.api.key = Key
-label.api.secret = Secret
+label.api.account.id = Account ID
+label.api.client.id = Client ID
+label.api.client.secret = Client secret
 label.api.up = Up
 label.api.down = Down
 label.api.remove = Remove API keys
 label.api.saved = API keys were saved. API works only with paid Zoom plans.
-error.api.ping = API keys for email {0} do not seem to work correctly
+error.api.ping = API keys for email account ID {0} do not seem to work correctly
 error.api.none.configured = There are no Zoom API keys configured by the administrator. You are not able to create a Zoom meeting.
 error.api.reuse = All configured API keys are in use at the moment. If you decide to start your meeting, another teacher's meeting will be stopped.
-sysadmin.maintain = Back to admin panel
+appadmin.maintain = Back to admin panel
 outcome.authoring.title = Learning outcomes
 outcome.authoring.input = Search and select by outcome name or code
 outcome.authoring.existing = Added outcomes
 outcome.authoring.existing.none = none
-outcome.authoring.create.new = [create new]
+outcome.authoring.create.new = [create new]
\ No newline at end of file
Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/dbupdates/patch20230730.sql
===================================================================
diff -u
--- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/dbupdates/patch20230730.sql	(revision 0)
+++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/dbupdates/patch20230730.sql	(revision 79f5d06324fa18a32a2d65cf0decd640fb2261a6)
@@ -0,0 +1,20 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+-- Put all sql statements below here
+
+
+ALTER TABLE tl_lazoom10_api
+    DROP COLUMN api_key,
+    DROP COLUMN api_secret,
+    ADD COLUMN account_id VARCHAR(32) NOT NULL,
+    ADD COLUMN client_id VARCHAR(32) NOT NULL,
+    ADD COLUMN client_secret VARCHAR(32) NOT NULL;
+
+
+-- Put all sql statements above here
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/Zoom.java
===================================================================
diff -u -r66bda55b4291ff10c230b0ab5227dab5fa058a8a -r79f5d06324fa18a32a2d65cf0decd640fb2261a6
--- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/Zoom.java	(.../Zoom.java)	(revision 66bda55b4291ff10c230b0ab5227dab5fa058a8a)
+++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/Zoom.java	(.../Zoom.java)	(revision 79f5d06324fa18a32a2d65cf0decd640fb2261a6)
@@ -23,9 +23,7 @@
 
 package org.lamsfoundation.lams.tool.zoom.model;
 
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
+import org.apache.log4j.Logger;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -37,11 +35,10 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
 
-import org.apache.log4j.Logger;
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
-
 @Entity
 @Table(name = "tl_lazoom10_zoom")
 public class Zoom implements java.io.Serializable, Cloneable {
@@ -73,7 +70,7 @@
     private boolean startInMonitor;
 
     @Column
-    private Integer duration = 120;
+    private Integer duration = 40;
 
     @Column(name = "reflect_on_activity")
     private boolean reflectOnActivity;
Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/ZoomApi.java
===================================================================
diff -u -r7f549341b0c03ba7cd3e0b55f4c1f936ad2da772 -r79f5d06324fa18a32a2d65cf0decd640fb2261a6
--- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/ZoomApi.java	(.../ZoomApi.java)	(revision 7f549341b0c03ba7cd3e0b55f4c1f936ad2da772)
+++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/ZoomApi.java	(.../ZoomApi.java)	(revision 79f5d06324fa18a32a2d65cf0decd640fb2261a6)
@@ -23,18 +23,12 @@
 
 package org.lamsfoundation.lams.tool.zoom.model;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-import org.lamsfoundation.lams.util.JsonUtil;
-
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.lamsfoundation.lams.util.JsonUtil;
 
+import javax.persistence.*;
+
 @Entity
 @Table(name = "tl_lazoom10_api")
 public class ZoomApi {
@@ -47,31 +41,26 @@
     @Column
     private String email;
 
-    @Column(name = "api_key")
-    private String key;
+    @Column(name = "account_id")
+    private String accountId;
 
-    @Column(name = "api_secret")
-    private String secret;
+    @Column(name = "client_id")
+    private String clientId;
 
+    @Column(name = "client_secret")
+    private String clientSecret;
+
     public ZoomApi() {
     }
 
-    public ZoomApi(String email, String key, String value) {
-	this.email = email;
-	this.key = key;
-	this.secret = value;
-    }
-
     public ZoomApi(ObjectNode apiJSON) {
 	this.uid = JsonUtil.optLong(apiJSON, "uid");
 	this.email = JsonUtil.optString(apiJSON, "email");
-	this.key = JsonUtil.optString(apiJSON, "key");
-	this.secret = JsonUtil.optString(apiJSON, "secret");
+	this.accountId = JsonUtil.optString(apiJSON, "accountId");
+	this.clientId = JsonUtil.optString(apiJSON, "clientId");
+	this.clientSecret = JsonUtil.optString(apiJSON, "clientSecret");
     }
 
-    /**
-     *
-     */
     public Long getUid() {
 	return uid;
     }
@@ -88,28 +77,37 @@
 	this.email = email;
     }
 
-    public String getKey() {
-	return key;
+    public String getAccountId() {
+	return accountId;
     }
 
-    public void setKey(String key) {
-	this.key = key;
+    public void setAccountId(String accountId) {
+	this.accountId = accountId;
     }
 
-    public String getSecret() {
-	return secret;
+    public String getClientId() {
+	return clientId;
     }
 
-    public void setSecret(String value) {
-	this.secret = value;
+    public void setClientId(String clientId) {
+	this.clientId = clientId;
     }
 
+    public String getClientSecret() {
+	return clientSecret;
+    }
+
+    public void setClientSecret(String value) {
+	this.clientSecret = value;
+    }
+
     public ObjectNode toJSON() {
 	ObjectNode result = JsonNodeFactory.instance.objectNode();
 	result.put("uid", uid);
 	result.put("email", email);
-	result.put("key", key);
-	result.put("secret", secret);
+	result.put("accountId", accountId);
+	result.put("clientId", clientId);
+	result.put("clientSecret", clientSecret);
 	return result;
     }
 }
\ No newline at end of file
Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java
===================================================================
diff -u -r39c44821fbe9ecde816b4795e55e2da17ed24d25 -r79f5d06324fa18a32a2d65cf0decd640fb2261a6
--- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java	(.../ZoomService.java)	(revision 39c44821fbe9ecde816b4795e55e2da17ed24d25)
+++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java	(.../ZoomService.java)	(revision 79f5d06324fa18a32a2d65cf0decd640fb2261a6)
@@ -23,32 +23,12 @@
 
 package org.lamsfoundation.lams.tool.zoom.service;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.StringWriter;
-import java.lang.reflect.Field;
-import java.net.HttpURLConnection;
-import java.nio.charset.Charset;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.TimeZone;
-import java.util.TreeMap;
-
-import javax.net.ssl.HttpsURLConnection;
-
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.integration.security.RandomPasswordGenerator;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
@@ -61,7 +41,6 @@
 import org.lamsfoundation.lams.tool.ToolCompletionStatus;
 import org.lamsfoundation.lams.tool.ToolContentManager;
 import org.lamsfoundation.lams.tool.ToolOutput;
-import org.lamsfoundation.lams.tool.ToolOutputDefinition;
 import org.lamsfoundation.lams.tool.ToolSessionExportOutputData;
 import org.lamsfoundation.lams.tool.ToolSessionManager;
 import org.lamsfoundation.lams.tool.exception.DataMissingException;
@@ -78,15 +57,21 @@
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.HttpUrlConnectionUtil;
 import org.lamsfoundation.lams.util.JsonUtil;
-
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-
-import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.SignatureAlgorithm;
 import sun.net.www.protocol.https.HttpsURLConnectionImpl;
 
+import javax.net.ssl.HttpsURLConnection;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.StringWriter;
+import java.lang.reflect.Field;
+import java.net.HttpURLConnection;
+import java.nio.charset.Charset;
+import java.text.SimpleDateFormat;
+import java.util.Base64;
+import java.util.Date;
+
 /**
  * An implementation of the IZoomService interface.
  *
@@ -109,12 +94,16 @@
 
     private ICoreNotebookService coreNotebookService;
 
+    private static String TOKEN_CACHE = null;
+    private static long TOKEN_CACHE_EXPIRE = 0;
+
     /* Methods from ToolSessionManager */
     @Override
     public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentId) throws ToolException {
 	if (ZoomService.logger.isDebugEnabled()) {
-	    ZoomService.logger.debug("entering method createToolSession:" + " toolSessionId = " + toolSessionId
-		    + " toolSessionName = " + toolSessionName + " toolContentId = " + toolContentId);
+	    ZoomService.logger.debug(
+		    "entering method createToolSession:" + " toolSessionId = " + toolSessionId + " toolSessionName = "
+			    + toolSessionName + " toolContentId = " + toolContentId);
 	}
 
 	ZoomSession session = new ZoomSession();
@@ -139,7 +128,7 @@
 
     @SuppressWarnings("rawtypes")
     @Override
-    public ToolSessionExportOutputData exportToolSession(List toolSessionIds)
+    public ToolSessionExportOutputData exportToolSession(java.util.List toolSessionIds)
 	    throws DataMissingException, ToolException {
 	return null;
     }
@@ -150,8 +139,9 @@
     }
 
     @Override
-    public SortedMap<String, ToolOutput> getToolOutput(List<String> names, Long toolSessionId, Long learnerId) {
-	return new TreeMap<>();
+    public java.util.SortedMap<String, org.lamsfoundation.lams.tool.ToolOutput> getToolOutput(
+	    java.util.List<String> names, Long toolSessionId, Long learnerId) {
+	return new java.util.TreeMap<>();
     }
 
     @Override
@@ -160,12 +150,13 @@
     }
 
     @Override
-    public List<ToolOutput> getToolOutputs(String name, Long toolContentId) {
-	return new ArrayList<>();
+    public java.util.List<org.lamsfoundation.lams.tool.ToolOutput> getToolOutputs(String name, Long toolContentId) {
+	return new java.util.ArrayList<>();
     }
 
     @Override
-    public List<ConfidenceLevelDTO> getConfidenceLevels(Long toolSessionId) {
+    public java.util.List<org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO> getConfidenceLevels(
+	    Long toolSessionId) {
 	return null;
     }
 
@@ -185,8 +176,9 @@
     public void copyToolContent(Long fromContentId, Long toContentId) throws ToolException {
 
 	if (ZoomService.logger.isDebugEnabled()) {
-	    ZoomService.logger.debug("entering method copyToolContent:" + " fromContentId=" + fromContentId
-		    + " toContentId=" + toContentId);
+	    ZoomService.logger.debug(
+		    "entering method copyToolContent:" + " fromContentId=" + fromContentId + " toContentId="
+			    + toContentId);
 	}
 
 	if (toContentId == null) {
@@ -219,8 +211,8 @@
 	}
 
 	for (ZoomSession session : zoom.getZoomSessions()) {
-	    List<NotebookEntry> entries = coreNotebookService.getEntry(session.getSessionId(),
-		    CoreNotebookConstants.NOTEBOOK_TOOL, ZoomConstants.TOOL_SIGNATURE);
+	    java.util.List<org.lamsfoundation.lams.notebook.model.NotebookEntry> entries = coreNotebookService.getEntry(
+		    session.getSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL, ZoomConstants.TOOL_SIGNATURE);
 	    for (NotebookEntry entry : entries) {
 		coreNotebookService.deleteEntry(entry);
 	    }
@@ -232,14 +224,15 @@
     @Override
     public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException {
 	if (ZoomService.logger.isDebugEnabled()) {
-	    ZoomService.logger.debug("Resetting Web Conference completion flag for user ID " + userId
-		    + " and toolContentId " + toolContentId);
+	    ZoomService.logger.debug(
+		    "Resetting Web Conference completion flag for user ID " + userId + " and toolContentId "
+			    + toolContentId);
 	}
 
 	Zoom zoom = getZoomByContentId(toolContentId);
 	if (zoom == null) {
-	    ZoomService.logger
-		    .warn("Did not find activity with toolContentId: " + toolContentId + " to remove learner content");
+	    ZoomService.logger.warn(
+		    "Did not find activity with toolContentId: " + toolContentId + " to remove learner content");
 	    return;
 	}
 
@@ -262,9 +255,9 @@
      * Export the XML fragment for the tool's content, along with any files needed for the content.
      *
      * @throws DataMissingException
-     *             if no tool content matches the toolSessionId
+     * 	if no tool content matches the toolSessionId
      * @throws ToolException
-     *             if any other error occurs
+     * 	if any other error occurs
      */
 
     @Override
@@ -293,7 +286,7 @@
      * Import the XML fragment for the tool's content, along with any files needed for the content.
      *
      * @throws ToolException
-     *             if any other error occurs
+     * 	if any other error occurs
      */
     @Override
     public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath, String fromVersion,
@@ -336,9 +329,9 @@
      * @return SortedMap of ToolOutputDefinitions with the key being the name of each definition
      */
     @Override
-    public SortedMap<String, ToolOutputDefinition> getToolOutputDefinitions(Long toolContentId, int definitionType)
-	    throws ToolException {
-	return new TreeMap<>();
+    public java.util.SortedMap<String, org.lamsfoundation.lams.tool.ToolOutputDefinition> getToolOutputDefinitions(
+	    Long toolContentId, int definitionType) throws ToolException {
+	return new java.util.TreeMap<>();
     }
 
     @Override
@@ -380,7 +373,8 @@
     }
 
     public NotebookEntry getEntry(Long id, Integer idType, String signature, Integer userID) {
-	List<NotebookEntry> list = coreNotebookService.getEntry(id, idType, signature, userID);
+	java.util.List<org.lamsfoundation.lams.notebook.model.NotebookEntry> list = coreNotebookService.getEntry(id,
+		idType, signature, userID);
 	if ((list == null) || list.isEmpty()) {
 	    return null;
 	} else {
@@ -437,7 +431,8 @@
     @Override
     @SuppressWarnings("unchecked")
     public Zoom getZoomByContentId(Long toolContentID) {
-	List<Zoom> list = zoomDAO.findByProperty(Zoom.class, "toolContentId", toolContentID);
+	java.util.List<org.lamsfoundation.lams.tool.zoom.model.Zoom> list = zoomDAO.findByProperty(Zoom.class,
+		"toolContentId", toolContentID);
 	if (list.isEmpty()) {
 	    return null;
 	} else {
@@ -463,7 +458,8 @@
     @Override
     @SuppressWarnings("unchecked")
     public ZoomSession getSessionBySessionId(Long toolSessionId) {
-	List<ZoomSession> list = zoomDAO.findByProperty(ZoomSession.class, "sessionId", toolSessionId);
+	java.util.List<org.lamsfoundation.lams.tool.zoom.model.ZoomSession> list = zoomDAO.findByProperty(
+		ZoomSession.class, "sessionId", toolSessionId);
 	if (list.isEmpty()) {
 	    return null;
 	} else {
@@ -474,10 +470,11 @@
     @Override
     @SuppressWarnings("unchecked")
     public ZoomUser getUserByUserIdAndSessionId(Integer userId, Long toolSessionId) {
-	Map<String, Object> map = new HashMap<>();
+	java.util.Map<String, Object> map = new java.util.HashMap<>();
 	map.put("userId", userId);
 	map.put("zoomSession.sessionId", toolSessionId);
-	List<ZoomUser> list = zoomDAO.findByProperties(ZoomUser.class, map);
+	java.util.List<org.lamsfoundation.lams.tool.zoom.model.ZoomUser> list = zoomDAO.findByProperties(ZoomUser.class,
+		map);
 	if (list.isEmpty()) {
 	    return null;
 	} else {
@@ -488,7 +485,8 @@
     @Override
     @SuppressWarnings("unchecked")
     public ZoomUser getUserByUID(Long uid) {
-	List<ZoomUser> list = zoomDAO.findByProperty(ZoomUser.class, "uid", uid);
+	java.util.List<org.lamsfoundation.lams.tool.zoom.model.ZoomUser> list = zoomDAO.findByProperty(ZoomUser.class,
+		"uid", uid);
 	if (list.isEmpty()) {
 	    return null;
 	} else {
@@ -528,8 +526,9 @@
 		"Setting the reflective field on a zoom. This doesn't make sense as the zoom is for reflection and we don't reflect on reflection!");
 	Zoom zoom = getZoomByContentId(toolContentId);
 	if (zoom == null) {
-	    throw new DataMissingException("Unable to set reflective data titled " + title
-		    + " on activity toolContentId " + toolContentId + " as the tool content does not exist.");
+	    throw new DataMissingException(
+		    "Unable to set reflective data titled " + title + " on activity toolContentId " + toolContentId
+			    + " as the tool content does not exist.");
 	}
 
 	zoom.setReflectOnActivity(Boolean.TRUE);
@@ -594,19 +593,20 @@
 	    return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_NOT_ATTEMPTED, null, null);
 	}
 
-	return new ToolCompletionStatus(learner.isFinishedActivity() ? ToolCompletionStatus.ACTIVITY_COMPLETED
+	return new ToolCompletionStatus(learner.isFinishedActivity()
+		? ToolCompletionStatus.ACTIVITY_COMPLETED
 		: ToolCompletionStatus.ACTIVITY_ATTEMPTED, null, null);
     }
 
     @Override
     public Boolean chooseApi(Long zoomUid) throws IOException {
 	Zoom zoom = (Zoom) zoomDAO.find(Zoom.class, zoomUid);
-	List<ZoomApi> apis = getApis();
+	java.util.List<org.lamsfoundation.lams.tool.zoom.model.ZoomApi> apis = getApis();
 	if (apis.isEmpty()) {
 	    return null;
 	}
 	ZoomApi chosenApi = null;
-	TreeMap<String, ZoomApi> liveApis = new TreeMap<>();
+	java.util.TreeMap<String, org.lamsfoundation.lams.tool.zoom.model.ZoomApi> liveApis = new java.util.TreeMap<>();
 	for (ZoomApi api : apis) {
 	    String meetingListURL = "users/" + api.getEmail() + "/meetings?type=live";
 	    HttpURLConnection connection = ZoomService.getZoomConnection(meetingListURL, "GET", null, api);
@@ -656,7 +656,7 @@
 	ObjectNode bodyJSON = JsonNodeFactory.instance.objectNode();
 	Date currentTime = new Date();
 	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
-	sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
+	sdf.setTimeZone(java.util.TimeZone.getTimeZone("GMT"));
 	String startTime = sdf.format(currentTime);
 	bodyJSON.put("topic", zoom.getTitle());
 	bodyJSON.put("type", 2);
@@ -718,25 +718,27 @@
 
     @SuppressWarnings("unchecked")
     @Override
-    public List<ZoomApi> getApis() {
+    public java.util.List<org.lamsfoundation.lams.tool.zoom.model.ZoomApi> getApis() {
 	return zoomDAO.findAll(ZoomApi.class);
     }
 
     @Override
-    public void saveApis(List<ZoomApi> apis) {
-	List<ZoomApi> existingApis = getApis();
-	Set<Long> delete = new HashSet<>();
-	Set<String> saved = new HashSet<>();
+    public void saveApis(java.util.List<org.lamsfoundation.lams.tool.zoom.model.ZoomApi> apis) {
+	java.util.List<org.lamsfoundation.lams.tool.zoom.model.ZoomApi> existingApis = getApis();
+	java.util.Set<Long> delete = new java.util.HashSet<>();
+	java.util.Set<String> saved = new java.util.HashSet<>();
 	for (ZoomApi existingApi : existingApis) {
 	    boolean found = false;
 	    for (ZoomApi api : apis) {
 		if (existingApi.getEmail().equalsIgnoreCase(api.getEmail())) {
 		    found = true;
 		    saved.add(api.getEmail());
-		    if (!existingApi.getKey().equals(api.getKey())
-			    || !existingApi.getSecret().equals(api.getSecret())) {
-			existingApi.setKey(api.getKey());
-			existingApi.setSecret(api.getSecret());
+		    if (!existingApi.getAccountId().equals(api.getAccountId()) || !existingApi.getClientId()
+			    .equals(api.getClientId()) || !existingApi.getClientSecret()
+			    .equals(api.getClientSecret())) {
+			existingApi.setAccountId(api.getAccountId());
+			existingApi.setClientId(api.getClientId());
+			existingApi.setClientSecret(api.getClientSecret());
 			zoomDAO.update(existingApi);
 		    }
 		    break;
@@ -750,32 +752,48 @@
 	    zoomDAO.deleteById(ZoomApi.class, uidToDelete);
 	}
 	for (ZoomApi api : apis) {
-	    if (!saved.contains(api.getEmail())) {
+	    if (!saved.contains(api.getClientId())) {
 		zoomDAO.insert(api);
 	    }
 	}
     }
 
     @Override
     public boolean pingZoomApi(Long uid) throws IOException {
-	ZoomApi api = (ZoomApi) zoomDAO.find(ZoomApi.class, uid);
+	ZoomApi api = zoomDAO.find(ZoomApi.class, uid);
 	HttpURLConnection connection = ZoomService.getZoomConnection("users/email?email=" + api.getEmail(), "GET", null,
 		api);
+
 	ObjectNode resultJSON = ZoomService.getReponse(connection);
 	return resultJSON != null && JsonUtil.optBoolean(resultJSON, "existed_email", false);
     }
 
-    private static String generateJWT(ZoomApi api) {
-	Date expiration = new Date(System.currentTimeMillis() + ZoomConstants.JWT_EXPIRATION_MILISECONDS);
-	return Jwts.builder().setHeaderParam("typ", "JWT").setIssuer(api.getKey()).setExpiration(expiration)
-		.signWith(SignatureAlgorithm.HS256, api.getSecret().getBytes()).compact();
+    private static String generateToken(ZoomApi api) throws IOException {
+	if (TOKEN_CACHE == null || TOKEN_CACHE_EXPIRE < System.currentTimeMillis()) {
+	    TOKEN_CACHE = null;
+
+	    String clientEncoded = Base64.getEncoder()
+		    .encodeToString((api.getClientId() + ":" + api.getClientSecret()).getBytes());
+
+	    HttpsURLConnection connection = (HttpsURLConnection) HttpUrlConnectionUtil.getConnection(
+		    ZoomConstants.ZOOM_TOKEN_URL + "?grant_type=account_credentials&account_id=" + api.getAccountId());
+	    connection.setRequestMethod("POST");
+	    connection.setRequestProperty("Authorization", "Basic " + clientEncoded);
+
+	    ObjectNode responseJSON = getReponse(connection);
+	    TOKEN_CACHE = JsonUtil.optString(responseJSON, "access_token");
+	    TOKEN_CACHE_EXPIRE =
+		    System.currentTimeMillis() + JsonUtil.optInt(responseJSON, "expires_in", 0) * 1000 - 10000;
+	}
+
+	return TOKEN_CACHE;
     }
 
     private static HttpURLConnection getZoomConnection(String urlSuffix, String method, String body, ZoomApi api)
 	    throws IOException {
-	HttpsURLConnection connection = (HttpsURLConnection) HttpUrlConnectionUtil
-		.getConnection(ZoomConstants.ZOOM_API_URL + urlSuffix);
-	connection.setRequestProperty("Authorization", "Bearer " + ZoomService.generateJWT(api));
+	HttpsURLConnection connection = (HttpsURLConnection) HttpUrlConnectionUtil.getConnection(
+		ZoomConstants.ZOOM_API_URL + urlSuffix);
+	connection.setRequestProperty("Authorization", "Bearer " + ZoomService.generateToken(api));
 	switch (method) {
 	    case "PATCH":
 		ZoomService.setRequestMethod(connection, method);
@@ -878,9 +896,9 @@
 	    }
 
 	    if (logger.isDebugEnabled()) {
-		logger.debug("Server response: " + code
-			+ (responseMessage == null ? "" : " " + connection.getResponseMessage())
-			+ (response == null ? "" : " " + response));
+		logger.debug("Server response: " + code + (responseMessage == null
+			? ""
+			: " " + connection.getResponseMessage()) + (response == null ? "" : " " + response));
 	    }
 	} finally {
 	    connection.disconnect();
Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/util/ZoomConstants.java
===================================================================
diff -u -r81abb42871bc57068ca574fa56e2f039ca04702a -r79f5d06324fa18a32a2d65cf0decd640fb2261a6
--- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/util/ZoomConstants.java	(.../ZoomConstants.java)	(revision 81abb42871bc57068ca574fa56e2f039ca04702a)
+++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/util/ZoomConstants.java	(.../ZoomConstants.java)	(revision 79f5d06324fa18a32a2d65cf0decd640fb2261a6)
@@ -54,10 +54,10 @@
     public static final String TOOL_CONTRIBUTE_URL = "tool/" + TOOL_SIGNATURE
 	    + "/monitoring/startMeeting.do?toolContentID=";
 
-    public static final long JWT_EXPIRATION_MILISECONDS = 5000;
     public static final String ZOOM_API_URL = "https://api.zoom.us/v2/";
+    public static final String ZOOM_TOKEN_URL = "https://zoom.us/oauth/token";
 
     private ZoomConstants() {
 	// prevent construction
     }
-}
+}
\ No newline at end of file
Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/AdminController.java
===================================================================
diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -r79f5d06324fa18a32a2d65cf0decd640fb2261a6
--- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/AdminController.java	(.../AdminController.java)	(revision f2ad75cef0c507a64877942631fee13efbc6ed50)
+++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/AdminController.java	(.../AdminController.java)	(revision 79f5d06324fa18a32a2d65cf0decd640fb2261a6)
@@ -23,11 +23,9 @@
 
 package org.lamsfoundation.lams.tool.zoom.web.controller;
 
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.tool.zoom.model.ZoomApi;
 import org.lamsfoundation.lams.tool.zoom.service.IZoomService;
@@ -40,9 +38,9 @@
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import javax.servlet.http.HttpServletRequest;
+import java.util.LinkedList;
+import java.util.List;
 
 @Controller
 @RequestMapping("/admin")
@@ -71,7 +69,7 @@
     public String save(HttpServletRequest request) throws Exception {
 	String apisJSONString = request.getParameter("apisJSON");
 	ArrayNode apisJSON = JsonUtil.readArray(apisJSONString);
-	List<ZoomApi> apis = new LinkedList<ZoomApi>();
+	List<ZoomApi> apis = new LinkedList<>();
 	for (int index = 0; index < apisJSON.size(); index++) {
 	    ObjectNode apiJSON = (ObjectNode) apisJSON.get(index);
 	    ZoomApi api = new ZoomApi(apiJSON);
@@ -87,7 +85,7 @@
 	apis = zoomService.getApis();
 	for (ZoomApi api : apis) {
 	    if (!zoomService.pingZoomApi(api.getUid())) {
-		errorMap.add("GLOBAL", messageService.getMessage("error.api.ping", new Object[] { api.getEmail() }));
+		errorMap.add("GLOBAL", messageService.getMessage("error.api.ping", new Object[] { api.getClientId() }));
 	    }
 	}
 	if (!errorMap.isEmpty()) {
Index: lams_tool_zoom/web/pages/admin/view.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r79f5d06324fa18a32a2d65cf0decd640fb2261a6
--- lams_tool_zoom/web/pages/admin/view.jsp	(.../view.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_zoom/web/pages/admin/view.jsp	(.../view.jsp)	(revision 79f5d06324fa18a32a2d65cf0decd640fb2261a6)
@@ -3,134 +3,139 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <lams:html>
-<c:set var="lams">
-	<lams:LAMSURL />
-</c:set>
-<c:set var="tool">
-	<lams:WebAppURL />
-</c:set>
-	
-<lams:head>  
-	<title>
-		<fmt:message key="activity.title" />
-	</title>
-	
-	<lams:css/>
-	<style type="text/css" scoped="scoped">
-		.api {
-			margin-top: 10px;
-		}
-				
-		.api .control {
-			padding-top: 7px;
-			cursor: pointer;
-		}
-		
-		.api:last-child .control {
-			visibility: hidden;
-		}
-		
-		.api:nth-last-child(2) .down, .api:first-child .up {
-			visibility: hidden !important;
-		}
-	</style>
-	
-	<lams:JSImport src="includes/javascript/common.js" />
-	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
-	<script type="text/javascript">
-		function removeApi(elem) {
-			$(elem).closest('.api').remove();
-		}
-	
-		function validateApi(elem){
-			var valid = true,
-				api = $(elem).closest('.api');
-			if (api.is(':last-child')) {
-				// set this api as a real one
-				api.clone().appendTo(api.parent()).find('input').val(null);
+	<c:set var="lams">
+		<lams:LAMSURL />
+	</c:set>
+	<c:set var="tool">
+		<lams:WebAppURL />
+	</c:set>
+
+	<lams:head>
+		<title>
+			<fmt:message key="activity.title" />
+		</title>
+
+		<lams:css/>
+		<style type="text/css" scoped="scoped">
+			.api {
+				margin-top: 10px;
 			}
-			$('input', api).each(function(){
-				valid &= $(this).val().trim() != '';
-			});
-			if (valid) {
-				// api has content now, so it is valid
-				api.removeClass('has-error');
-			} else if (!api.is(':last-child')) {
-				// mark empty api as invalid
-				api.addClass('has-error');
+
+			.api .control {
+				padding-top: 7px;
+				cursor: pointer;
 			}
-		}
-	
-		function submitApis() {
-			var apis = [],	
-				error = false;
-			$('.api').each(function(){
-				var api = $(this);
-				if (api.hasClass('has-error')) {
-					error = true;
+
+			.api:last-child .control {
+				visibility: hidden;
+			}
+
+			.api:nth-last-child(2) .down, .api:first-child .up {
+				visibility: hidden !important;
+			}
+		</style>
+
+		<lams:JSImport src="includes/javascript/common.js" />
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript">
+			function removeApi(elem) {
+				$(elem).closest('.api').remove();
+			}
+
+			function validateApi(elem){
+				var valid = true,
+						api = $(elem).closest('.api');
+				if (api.is(':last-child')) {
+					// set this api as a real one
+					api.clone().appendTo(api.parent()).find('input').val(null);
+				}
+				$('input', api).each(function(){
+					valid &= $(this).val().trim() != '';
+				});
+				if (valid) {
+					// api has content now, so it is valid
+					api.removeClass('has-error');
+				} else if (!api.is(':last-child')) {
+					// mark empty api as invalid
+					api.addClass('has-error');
+				}
+			}
+
+			function submitApis() {
+				var apis = [],
+						error = false;
+				$('.api').each(function(){
+					var api = $(this);
+					if (api.hasClass('has-error')) {
+						error = true;
+						return false;
+					} else if (api.is(':last-child')) {
+						// skip last row as it is the api placeholder
+						return true;
+					}
+					apis.push({
+						'email' : $('.email', api).val().trim(),
+						'accountId' : $('.accountId', api).val().trim(),
+						'clientId'   : $('.clientId', api).val().trim(),
+						'clientSecret': $('.clientSecret', api).val().trim()
+					});
+				});
+
+				if (error) {
 					return false;
-				} else if (api.is(':last-child')) {
-					// skip last row as it is the api placeholder
-					return true;
 				}
-				apis.push({
-					'email' : $('.email', api).val().trim(),
-					'key'   : $('.key', api).val().trim(),
-					'secret': $('.secret', api).val().trim()
+
+				$('#apisJSON').val(JSON.stringify(apis));
+				return true;
+			}
+
+			$(document).ready(function () {
+				var apis = ${apis},
+						api = $('.api');
+				$.each(apis, function(){
+					var apiEntry = api.clone().insertBefore(api);
+					apiEntry.find('.email').val(this.email);
+					apiEntry.find('.accountId').val(this.accountId);
+					apiEntry.find('.clientId').val(this.clientId);
+					apiEntry.find('.clientSecret').val(this.clientSecret);
 				});
 			});
-			
-			if (error) {
-				return false;
-			}
-	
-			$('#apisJSON').val(JSON.stringify(apis));
-			return true;
-		}
-		
-		$(document).ready(function () {
-			var apis = ${apis},
-				api = $('.api');
-			$.each(apis, function(){
-				var apiEntry = api.clone().insertBefore(api);
-				apiEntry.find('.email').val(this.email);
-				apiEntry.find('.key').val(this.key);
-				apiEntry.find('.secret').val(this.secret);
-			});
-		});
-	</script>
-</lams:head>
+		</script>
+	</lams:head>
 
-<body class="stripes">
+	<body class="stripes">
 	<c:set var="title"><fmt:message key="admin.title" /></c:set>
 	<lams:Page type="admin" title="${title}">
 		<div class="container-fluid">
 			<div class="panel panel-default panel-admin-page">
 				<div class="panel-body panel-admin-body">
 					<p><a href="<lams:LAMSURL/>/admin/appadminstart.do" class="btn btn-primary"><fmt:message key="appadmin.maintain" /></a></p>
 					<c:if test="${saveOK}">
-						 <lams:Alert type="info" close="false">
-						 	<fmt:message key='label.api.saved'/>
-						 </lams:Alert>
+						<lams:Alert type="info" close="false">
+							<fmt:message key='label.api.saved'/>
+						</lams:Alert>
 					</c:if>
 					<lams:errors/>
-					
+
 					<div>
 						<div class="row api">
 							<div class="col-xs-3">
 								<input type="text" class="form-control email" placeholder="<fmt:message key='label.api.email'/>" onkeyup="javascript:validateApi(this)"/>
 							</div>
-							<div class="col-xs-3">
-								<input type="text" class="form-control key" placeholder="<fmt:message key='label.api.key'/>" onkeyup="javascript:validateApi(this)"/>
+							<div class="col-xs-2">
+								<input type="text" class="form-control accountId" placeholder="<fmt:message key='label.api.account.id'/>" onkeyup="javascript:validateApi(this)"/>
 							</div>
-							<div class="col-xs-5">
-								<input type="text" class="form-control secret" placeholder="<fmt:message key='label.api.secret'/>" onkeyup="javascript:validateApi(this)"/>
+							<div class="col-xs-2">
+								<input type="text" class="form-control clientId" placeholder="<fmt:message key='label.api.client.id'/>" onkeyup="javascript:validateApi(this)"/>
 							</div>
-				 			<div class="col-xs-1 control" title="<fmt:message key='label.api.remove' />" onclick="javascript:removeApi(this)">
+							<div class="col-xs-4">
+								<input type="text" class="form-control clientSecret" placeholder="<fmt:message key='label.api.client.secret'/>" onkeyup="javascript:validateApi(this)"/>
+							</div>
+							<div class="col-xs-1 control" title="<fmt:message key='label.api.remove' />" onclick="javascript:removeApi(this)">
 								<i class="fa fa-times"></i>
-				 			</div>
+							</div>
 						</div>
 					</div>
 					<form onsubmit="javascript:submitApis()" action="save.do" method="post">
@@ -140,6 +145,6 @@
 				</div>
 			</div>
 		</div>
-		</lams:Page>
+	</lams:Page>
 	</body>
 </lams:html>
\ No newline at end of file
Index: lams_tool_zoom/web/pages/authoring/advanced.jsp
===================================================================
diff -u -r39c44821fbe9ecde816b4795e55e2da17ed24d25 -r79f5d06324fa18a32a2d65cf0decd640fb2261a6
--- lams_tool_zoom/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 39c44821fbe9ecde816b4795e55e2da17ed24d25)
+++ lams_tool_zoom/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 79f5d06324fa18a32a2d65cf0decd640fb2261a6)
@@ -73,7 +73,7 @@
 	$('#durationSwitch').change(function(){
 		var duration = $('#duration');
 		if ($(this).prop('checked')) {
-			duration.prop('disabled', false).val("120");
+			duration.prop('disabled', false).val("40");
 		} else {
 			duration.prop('disabled', true).val(null);
 		}