Index: lams_tool_zoom/conf/hibernate/mappings/org/lamsfoundation/lams/tool/zoom/model/Zoom.hbm.xml
===================================================================
diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -r6c62e5beb70cd0b72dcec44eaf80ba489a442fb4
--- lams_tool_zoom/conf/hibernate/mappings/org/lamsfoundation/lams/tool/zoom/model/Zoom.hbm.xml	(.../Zoom.hbm.xml)	(revision 2cf1e086b82a29fae22136351fc7a44821181323)
+++ lams_tool_zoom/conf/hibernate/mappings/org/lamsfoundation/lams/tool/zoom/model/Zoom.hbm.xml	(.../Zoom.hbm.xml)	(revision 6c62e5beb70cd0b72dcec44eaf80ba489a442fb4)
@@ -86,8 +86,25 @@
             column="reflect_instructions"
             length="65535"
         />
-
+        
         <property
+            name="startInMonitor"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="start_in_monitor"
+            length="1"
+        />
+        
+        <property
+            name="duration"
+            type="java.lang.Integer"
+            update="true"
+            insert="true"
+            column="duration"
+        />
+        
+        <property
             name="contentInUse"
             type="boolean"
             update="true"
Index: lams_tool_zoom/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rce10b59466077750298e5a6140680512ac8085a2 -r6c62e5beb70cd0b72dcec44eaf80ba489a442fb4
--- lams_tool_zoom/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision ce10b59466077750298e5a6140680512ac8085a2)
+++ lams_tool_zoom/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 6c62e5beb70cd0b72dcec44eaf80ba489a442fb4)
@@ -45,6 +45,9 @@
 heading.learner  =Learner
 heading.notebookEntry  =Notebook entry
 advanced.reflectOnActivity  =Add a notebook at end of Zoom activity with the following instructions
+advanced.startInMonitor =Only the teacher can start the meeting
+advanced.duration.switch =Limit duration of the meeting (recommended)
+advanced.duration =duration (minutes)
 authoring.msg.cancel.save  =Do you want to close this window without saving?
 monitor.summary.th.advancedSettings  =Advanced settings
 monitor.summary.zoomSettings  =Zoom settings
Index: lams_tool_zoom/db/sql/create_lams_tool_zoom.sql
===================================================================
diff -u -r5da86331a25afcff7dfa0dd4647187c5beaa757b -r6c62e5beb70cd0b72dcec44eaf80ba489a442fb4
--- lams_tool_zoom/db/sql/create_lams_tool_zoom.sql	(.../create_lams_tool_zoom.sql)	(revision 5da86331a25afcff7dfa0dd4647187c5beaa757b)
+++ lams_tool_zoom/db/sql/create_lams_tool_zoom.sql	(.../create_lams_tool_zoom.sql)	(revision 6c62e5beb70cd0b72dcec44eaf80ba489a442fb4)
@@ -10,6 +10,8 @@
   instructions mediumtext,
   reflect_on_activity bit(1),
   reflect_instructions mediumtext,
+  start_in_monitor bit(1) DEFAULT 1,
+  duration smallint,
   content_in_use bit(1),
   define_later bit(1),
   api_id bigint(20),
@@ -61,6 +63,8 @@
 	title,
 	instructions,
 	tool_content_id,
+	start_in_monitor,
+	duration,
 	content_in_use,
 	define_later,
 	reflect_on_activity
@@ -69,6 +73,8 @@
 	"Zoom",
 	"Instructions",
 	${default_content_id},
+	1,
+	120,
 	0,
 	0,
 	0
Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/Zoom.java
===================================================================
diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -r6c62e5beb70cd0b72dcec44eaf80ba489a442fb4
--- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/Zoom.java	(.../Zoom.java)	(revision 2cf1e086b82a29fae22136351fc7a44821181323)
+++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/Zoom.java	(.../Zoom.java)	(revision 6c62e5beb70cd0b72dcec44eaf80ba489a442fb4)
@@ -51,6 +51,10 @@
 
     private String instructions;
 
+    private boolean startInMonitor;
+
+    private Integer duration = 120;
+
     private boolean reflectOnActivity;
 
     private String reflectInstructions;
@@ -142,9 +146,6 @@
 	this.instructions = instructions;
     }
 
-    /**
-     *
-     */
     public boolean isReflectOnActivity() {
 	return reflectOnActivity;
     }
@@ -153,9 +154,6 @@
 	this.reflectOnActivity = reflectOnActivity;
     }
 
-    /**
-     *
-     */
     public String getReflectInstructions() {
 	return reflectInstructions;
     }
@@ -164,11 +162,22 @@
 	this.reflectInstructions = reflectInstructions;
     }
 
-    /**
-     *
-     *
-     */
+    public boolean isStartInMonitor() {
+	return startInMonitor;
+    }
 
+    public void setStartInMonitor(boolean startInMonitor) {
+	this.startInMonitor = startInMonitor;
+    }
+
+    public Integer getDuration() {
+	return duration;
+    }
+
+    public void setDuration(Integer duration) {
+	this.duration = duration;
+    }
+
     public boolean isContentInUse() {
 	return this.contentInUse;
     }
Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java
===================================================================
diff -u -r7007ac0a21388e566f9448a3ec3a90826aaf4dcd -r6c62e5beb70cd0b72dcec44eaf80ba489a442fb4
--- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java	(.../ZoomService.java)	(revision 7007ac0a21388e566f9448a3ec3a90826aaf4dcd)
+++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java	(.../ZoomService.java)	(revision 6c62e5beb70cd0b72dcec44eaf80ba489a442fb4)
@@ -636,30 +636,24 @@
 	    throw new ZoomException("Can not create a meeting without API keys chosen");
 	}
 	JSONObject bodyJSON = new JSONObject();
-	JSONObject settings = new JSONObject();
-	settings.put("approval_type", 0);
-	settings.put("join_before_host", true);
 	Date currentTime = new Date();
 	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
 	sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
 	String startTime = sdf.format(currentTime);
-	bodyJSON.put("topic", zoom.getTitle()).put("type", 2).put("start_time", startTime).put("settings", settings);
-
+	bodyJSON.put("topic", zoom.getTitle()).put("type", 2).put("start_time", startTime);
 	HttpURLConnection connection = ZoomService.getZoomConnection("users/" + zoom.getApi().getEmail() + "/meetings",
 		"POST", bodyJSON.toString(), zoom.getApi());
 	JSONObject responseJSON = ZoomService.getReponse(connection);
-	String startURL = responseJSON.getString("start_url");
 	String meetingId = String.valueOf(responseJSON.getLong("id"));
+	zoom.setMeetingId(meetingId);
 
-	ZoomService.switchOffRegistrantEmails(zoom.getApi(), meetingId);
+	ZoomService.configureMeeting(zoom);
 
-	zoom.setMeetingStartUrl(startURL);
-	zoom.setMeetingId(meetingId);
 	zoomDAO.update(zoom);
 	if (logger.isDebugEnabled()) {
 	    logger.debug("Created meeting: " + meetingId);
 	}
-	return startURL;
+	return zoom.getMeetingStartUrl();
     }
 
     @Override
@@ -730,7 +724,8 @@
 
     public boolean pingZoomApi(Long uid) throws IOException, JSONException {
 	ZoomApi api = (ZoomApi) zoomDAO.find(ZoomApi.class, uid);
-	HttpURLConnection connection = ZoomService.getZoomConnection("users/email?email=" + api.getEmail(), "GET", null, api);
+	HttpURLConnection connection = ZoomService.getZoomConnection("users/email?email=" + api.getEmail(), "GET", null,
+		api);
 	JSONObject resultJSON = ZoomService.getReponse(connection);
 	return resultJSON != null && resultJSON.getBoolean("existed_email");
     }
@@ -772,16 +767,32 @@
 	return connection;
     }
 
-    private static void switchOffRegistrantEmails(ZoomApi api, String meetingId) throws IOException, JSONException {
+    /**
+     * Put extra options which can not be set when creating a meeting
+     */
+    private static void configureMeeting(Zoom zoom) throws IOException, JSONException {
 	JSONObject bodyJSON = new JSONObject();
 	JSONObject settings = new JSONObject();
+	// this setting can not be set during creation, thus we need another call
 	settings.put("registrants_confirmation_email", false);
+	// these settings could have been set during creation, but this call would have overwritten them, so we set them here
+	settings.put("approval_type", 0);
+	settings.put("join_before_host", !zoom.isStartInMonitor());
 	bodyJSON.put("settings", settings);
-	HttpURLConnection connection = ZoomService.getZoomConnection("meetings/" + meetingId, "PATCH",
-		bodyJSON.toString(), api);
+	if (zoom.getDuration() != null) {
+	    bodyJSON.put("duration", zoom.getDuration());
+	}
+	HttpURLConnection connection = ZoomService.getZoomConnection("meetings/" + zoom.getMeetingId(), "PATCH",
+		bodyJSON.toString(), zoom.getApi());
 	ZoomService.getReponse(connection);
+	// verify changes and get the new start URL
+	connection = ZoomService.getZoomConnection("meetings/" + zoom.getMeetingId(), "GET", null, zoom.getApi());
+	JSONObject responseJSON = ZoomService.getReponse(connection);
+	String startURL = responseJSON.getString("start_url");
+	zoom.setMeetingStartUrl(startURL);
+
 	if (logger.isDebugEnabled()) {
-	    logger.debug("Switched off registrant emails for meeting: " + meetingId);
+	    logger.debug("Configured meeting: " + zoom.getMeetingId());
 	}
     }
 
Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/AuthoringAction.java
===================================================================
diff -u -rce10b59466077750298e5a6140680512ac8085a2 -r6c62e5beb70cd0b72dcec44eaf80ba489a442fb4
--- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision ce10b59466077750298e5a6140680512ac8085a2)
+++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 6c62e5beb70cd0b72dcec44eaf80ba489a442fb4)
@@ -165,6 +165,9 @@
 	zoom.setInstructions(authForm.getInstructions());
 	zoom.setReflectOnActivity(authForm.isReflectOnActivity());
 	zoom.setReflectInstructions(authForm.getReflectInstructions());
+	zoom.setStartInMonitor(authForm.isStartInMonitor());
+	Integer duration = authForm.getDuration();
+	zoom.setDuration(duration != null && duration > 0 ? duration : null);
     }
 
     /**
Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/LearningAction.java
===================================================================
diff -u -r37f066ac5ffb3067a1f8094f8c41d5e8f7aa2b3f -r6c62e5beb70cd0b72dcec44eaf80ba489a442fb4
--- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 37f066ac5ffb3067a1f8094f8c41d5e8f7aa2b3f)
+++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 6c62e5beb70cd0b72dcec44eaf80ba489a442fb4)
@@ -231,18 +231,20 @@
 	// set toolSessionID in request
 	request.setAttribute(ZoomConstants.ATTR_TOOL_SESSION_ID, session.getSessionId());
 
-	if (mode.isAuthor()) {
+	if (mode.isAuthor() || !zoom.isStartInMonitor()) {
 	    // start a meeting just like a monitor would
 	    ActionErrors errors = ZoomUtil.startMeeting(zoomService, zoom, request);
 	    if (!errors.isEmpty()) {
 		this.addErrors(request, errors);
 	    }
-	} else {
+	}
+	if (!mode.isAuthor()) {
 	    // register a learner for the meeting
 	    String meetingURL = user.getMeetingJoinUrl();
 	    if (meetingURL == null && zoom.getMeetingId() != null) {
 		meetingURL = zoomService.registerUser(zoom.getUid(), user.getUid(), session.getSessionName());
 	    }
+	    // if start in monitor is not set, this overwrites the URL set in ZoomUtil.startMeeting() above
 	    request.setAttribute(ZoomConstants.ATTR_MEETING_URL, meetingURL);
 	}
 
Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/forms/AuthoringForm.java
===================================================================
diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -r6c62e5beb70cd0b72dcec44eaf80ba489a442fb4
--- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/forms/AuthoringForm.java	(.../AuthoringForm.java)	(revision 2cf1e086b82a29fae22136351fc7a44821181323)
+++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/forms/AuthoringForm.java	(.../AuthoringForm.java)	(revision 6c62e5beb70cd0b72dcec44eaf80ba489a442fb4)
@@ -36,7 +36,6 @@
  *
  */
 public class AuthoringForm extends ActionForm {
-
     private static final long serialVersionUID = 3950453134542135495L;
 
     // Fields
@@ -49,6 +48,10 @@
 
     private String reflectInstructions;
 
+    private boolean startInMonitor;
+
+    private Integer duration;
+
     private String currentTab;
 
     private String dispatch;
@@ -113,6 +116,22 @@
 	this.reflectInstructions = reflectInstructions;
     }
 
+    public boolean isStartInMonitor() {
+	return startInMonitor;
+    }
+
+    public void setStartInMonitor(boolean startInMonitor) {
+	this.startInMonitor = startInMonitor;
+    }
+
+    public Integer getDuration() {
+	return duration;
+    }
+
+    public void setDuration(Integer duration) {
+	this.duration = duration;
+    }
+
     public String getTitle() {
 	return title;
     }
Index: lams_tool_zoom/web/pages/authoring/advanced.jsp
===================================================================
diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -r6c62e5beb70cd0b72dcec44eaf80ba489a442fb4
--- lams_tool_zoom/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 2cf1e086b82a29fae22136351fc7a44821181323)
+++ lams_tool_zoom/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 6c62e5beb70cd0b72dcec44eaf80ba489a442fb4)
@@ -1,10 +1,48 @@
 <%@ include file="/common/taglibs.jsp"%>
 
+<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+<c:set var="durationSet" value="${not empty formBean.duration && formBean.duration > 0}" />
+
 <!-- ========== Advanced Tab ========== -->
 
 <lams:SimplePanel titleKey="label.activity.completion">
 
 	<div class="checkbox voffset10">
+		<label for="startInMonitor">
+			<html:checkbox property="startInMonitor" value="1" styleClass="noBorder" styleId="startInMonitor"></html:checkbox> 
+			<fmt:message key="advanced.startInMonitor" />
+		</label>
+	</div>
+	
+	<div class="checkbox">
+		<label for="durationSwitch">
+			<input type="checkbox" id="durationSwitch" class="noBorder" 
+				<c:if test="${durationSet}">
+					checked="checked"
+				</c:if>
+			/>
+			<fmt:message key="advanced.duration.switch" />
+		</label>
+	</div>
+	
+	<div class="form-group">
+		<label for="duration">
+			<input type="number" name="duration" id="duration" class="form-control"
+				   max="99999" min="1" style="width: 100px; display:inline-block; margin-right: 10px; margin-left: 20px"
+					<c:choose>
+						<c:when test="${durationSet}">
+							value="${formBean.duration}"
+						</c:when>
+						<c:otherwise>
+							disabled="disabled"
+						</c:otherwise>
+					</c:choose>
+			/>
+			<fmt:message key="advanced.duration" />
+		</label>
+	</div>
+
+	<div class="checkbox voffset10">
 		<label for="reflectOnActivity"> <html:checkbox property="reflectOnActivity" value="1" styleClass="noBorder"
 				styleId="reflectOnActivity"></html:checkbox> <fmt:message key="advanced.reflectOnActivity" />
 		</label>
@@ -18,9 +56,9 @@
 
 <script type="text/javascript">
 	//automatically turn on refect option if there are text input in refect instruction area
-	var ra = document.getElementById("reflectInstructions");
-	var rao = document.getElementById("reflectOnActivity");
-	function turnOnRefect() {
+	var ra = document.getElementById("reflectInstructions"),
+		rao = document.getElementById("reflectOnActivity");
+	function turnOnReflect() {
 		if (isEmpty(ra.value)) {
 			//turn off	
 			rao.checked = false;
@@ -29,8 +67,14 @@
 			rao.checked = true;
 		}
 	}
+	ra.onkeyup = turnOnReflect;
 
-	ra.onkeyup = turnOnRefect;
-</script>
-
-
+	$('#durationSwitch').change(function(){
+		var duration = $('#duration');
+		if ($(this).prop('checked')) {
+			duration.prop('disabled', false).val("120");
+		} else {
+			duration.prop('disabled', true).val(null);
+		}
+	});
+</script>
\ No newline at end of file