Index: lams_tool_zoom/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r0ebb4cd78af814bc30d7ef26486f7f1ed60586fc -r39c44821fbe9ecde816b4795e55e2da17ed24d25
--- lams_tool_zoom/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 0ebb4cd78af814bc30d7ef26486f7f1ed60586fc)
+++ lams_tool_zoom/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 39c44821fbe9ecde816b4795e55e2da17ed24d25)
@@ -50,7 +50,6 @@
 advanced.startInMonitor =Only the teacher can start the meeting
 advanced.duration.switch =Limit duration of the meeting (recommended)
 advanced.duration =duration (minutes)
-advanced.password =Require a password to join the meeting
 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/src/java/org/lamsfoundation/lams/tool/zoom/dbupdates/patch20200514.sql
===================================================================
diff -u
--- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/dbupdates/patch20200514.sql	(revision 0)
+++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/dbupdates/patch20200514.sql	(revision 39c44821fbe9ecde816b4795e55e2da17ed24d25)
@@ -0,0 +1,11 @@
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS = 0;
+
+
+-- LDEV-5026 Always password protect Zoom meetings
+ALTER TABLE tl_lazoom10_zoom DROP COLUMN enable_meeting_password;
+
+-- 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 -r0ebb4cd78af814bc30d7ef26486f7f1ed60586fc -r39c44821fbe9ecde816b4795e55e2da17ed24d25
--- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/Zoom.java	(.../Zoom.java)	(revision 0ebb4cd78af814bc30d7ef26486f7f1ed60586fc)
+++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/Zoom.java	(.../Zoom.java)	(revision 39c44821fbe9ecde816b4795e55e2da17ed24d25)
@@ -101,9 +101,6 @@
     @Column(name = "meeting_password")
     private String meetingPassword;
 
-    @Column(name = "enable_meeting_password")
-    private boolean enableMeetingPassword;
-
     @OneToMany(mappedBy = "zoom")
     private Set<ZoomSession> zoomSessions;
 
@@ -235,14 +232,6 @@
 	this.meetingStartUrl = meetingStartUrl;
     }
 
-    public boolean isEnableMeetingPassword() {
-	return enableMeetingPassword;
-    }
-
-    public void setEnableMeetingPassword(boolean enableMeetingPassword) {
-	this.enableMeetingPassword = enableMeetingPassword;
-    }
-
     public String getMeetingPassword() {
 	return meetingPassword;
     }
Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java
===================================================================
diff -u -r0ebb4cd78af814bc30d7ef26486f7f1ed60586fc -r39c44821fbe9ecde816b4795e55e2da17ed24d25
--- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java	(.../ZoomService.java)	(revision 0ebb4cd78af814bc30d7ef26486f7f1ed60586fc)
+++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java	(.../ZoomService.java)	(revision 39c44821fbe9ecde816b4795e55e2da17ed24d25)
@@ -704,10 +704,9 @@
 	if (meetingJoinURL == null) {
 	    throw new ZoomException("Could not register user " + user.getUid() + " for meeting " + zoom.getMeetingId());
 	}
-	if (zoom.isEnableMeetingPassword()) {
-	    // strip URL from password so users need to provide it manually
-	    meetingJoinURL = meetingJoinURL.replaceFirst("&pwd=[^&]+", "");
-	}
+	// strip URL from password so users need to provide it manually
+	meetingJoinURL = meetingJoinURL.replaceFirst("&pwd=[^&]+", "");
+
 	user.setMeetingJoinUrl(meetingJoinURL);
 	zoomDAO.update(user);
 	if (logger.isDebugEnabled()) {
@@ -818,11 +817,9 @@
 	if (zoom.getDuration() != null) {
 	    bodyJSON.put("duration", zoom.getDuration());
 	}
-	if (zoom.isEnableMeetingPassword()) {
-	    String password = RandomPasswordGenerator.nextPassword(6);
-	    bodyJSON.put("password", password);
-	    zoom.setMeetingPassword(password);
-	}
+	String password = RandomPasswordGenerator.nextPassword(6);
+	bodyJSON.put("password", password);
+	zoom.setMeetingPassword(password);
 
 	HttpURLConnection connection = ZoomService.getZoomConnection("meetings/" + zoom.getMeetingId(), "PATCH",
 		bodyJSON.toString(), zoom.getApi());
Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/util/ZoomUtil.java
===================================================================
diff -u -r0ebb4cd78af814bc30d7ef26486f7f1ed60586fc -r39c44821fbe9ecde816b4795e55e2da17ed24d25
--- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/util/ZoomUtil.java	(.../ZoomUtil.java)	(revision 0ebb4cd78af814bc30d7ef26486f7f1ed60586fc)
+++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/util/ZoomUtil.java	(.../ZoomUtil.java)	(revision 39c44821fbe9ecde816b4795e55e2da17ed24d25)
@@ -58,9 +58,8 @@
 	}
 
 	request.setAttribute(ZoomConstants.ATTR_MEETING_URL, meetingURL);
-	if (zoom.isEnableMeetingPassword()) {
-	    request.setAttribute(ZoomConstants.ATTR_MEETING_PASSWORD, zoom.getMeetingPassword());
-	}
+	request.setAttribute(ZoomConstants.ATTR_MEETING_PASSWORD, zoom.getMeetingPassword());
+	
 	return errorMap;
     }
 }
\ No newline at end of file
Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/AuthoringController.java
===================================================================
diff -u -r0ebb4cd78af814bc30d7ef26486f7f1ed60586fc -r39c44821fbe9ecde816b4795e55e2da17ed24d25
--- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 0ebb4cd78af814bc30d7ef26486f7f1ed60586fc)
+++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 39c44821fbe9ecde816b4795e55e2da17ed24d25)
@@ -169,7 +169,6 @@
 	zoom.setReflectOnActivity(authForm.isReflectOnActivity());
 	zoom.setReflectInstructions(authForm.getReflectInstructions());
 	zoom.setStartInMonitor(authForm.isStartInMonitor());
-	zoom.setEnableMeetingPassword(authForm.isEnableMeetingPassword());
 	Integer duration = authForm.getDuration();
 	zoom.setDuration(duration != null && duration > 0 ? duration : null);
     }
Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/LearningController.java
===================================================================
diff -u -r0ebb4cd78af814bc30d7ef26486f7f1ed60586fc -r39c44821fbe9ecde816b4795e55e2da17ed24d25
--- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/LearningController.java	(.../LearningController.java)	(revision 0ebb4cd78af814bc30d7ef26486f7f1ed60586fc)
+++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/LearningController.java	(.../LearningController.java)	(revision 39c44821fbe9ecde816b4795e55e2da17ed24d25)
@@ -231,9 +231,7 @@
 		}
 		// if start in monitor is not set, this overwrites the URL set in ZoomUtil.startMeeting() above
 		request.setAttribute(ZoomConstants.ATTR_MEETING_URL, meetingURL);
-		if (zoom.isEnableMeetingPassword()) {
-		    request.setAttribute(ZoomConstants.ATTR_MEETING_PASSWORD, zoom.getMeetingPassword());
-		}
+		request.setAttribute(ZoomConstants.ATTR_MEETING_PASSWORD, zoom.getMeetingPassword());
 	    }
 
 	} catch (Exception e) {
Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/forms/AuthoringForm.java
===================================================================
diff -u -r0ebb4cd78af814bc30d7ef26486f7f1ed60586fc -r39c44821fbe9ecde816b4795e55e2da17ed24d25
--- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/forms/AuthoringForm.java	(.../AuthoringForm.java)	(revision 0ebb4cd78af814bc30d7ef26486f7f1ed60586fc)
+++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/forms/AuthoringForm.java	(.../AuthoringForm.java)	(revision 39c44821fbe9ecde816b4795e55e2da17ed24d25)
@@ -49,8 +49,6 @@
 
     private String sessionMapID;
 
-    private boolean enableMeetingPassword;
-
     private SessionMap<String, Object> sessionMap;
 
     public String getSessionMapID() {
@@ -125,14 +123,6 @@
 	this.title = title;
     }
 
-    public boolean isEnableMeetingPassword() {
-	return enableMeetingPassword;
-    }
-
-    public void setEnableMeetingPassword(boolean enableMeetingPassword) {
-	this.enableMeetingPassword = enableMeetingPassword;
-    }
-
     public void setSessionMap(SessionMap<String, Object> sessionMap) {
 	this.sessionMap = sessionMap;
     }
Index: lams_tool_zoom/web/pages/authoring/advanced.jsp
===================================================================
diff -u -r0ebb4cd78af814bc30d7ef26486f7f1ed60586fc -r39c44821fbe9ecde816b4795e55e2da17ed24d25
--- lams_tool_zoom/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 0ebb4cd78af814bc30d7ef26486f7f1ed60586fc)
+++ lams_tool_zoom/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 39c44821fbe9ecde816b4795e55e2da17ed24d25)
@@ -16,13 +16,6 @@
 	</div>
 	
 	<div class="checkbox">
-		<label for="enableMeetingPassword">
-			<form:checkbox path="enableMeetingPassword" cssClass="noBorder" id="enableMeetingPassword" />
-			<fmt:message key="advanced.password" />
-		</label>
-	</div>
-	
-	<div class="checkbox">
 		<label for="durationSwitch">
 			<input type="checkbox" id="durationSwitch" class="noBorder" 
 				<c:if test="${durationSet}">