diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/model/request/EndMeeting.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/model/request/EndMeeting.java
index 1feeaef1fc..c95e76076c 100755
--- a/bbb-common-web/src/main/java/org/bigbluebutton/api/model/request/EndMeeting.java
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/model/request/EndMeeting.java
@@ -7,6 +7,7 @@ import org.bigbluebutton.api.model.shared.Checksum;
 import org.bigbluebutton.api.model.shared.ModeratorPassword;
 
 import javax.validation.Valid;
+import javax.validation.constraints.NotEmpty;
 import java.util.Map;
 
 public class EndMeeting extends RequestWithChecksum<EndMeeting.Params> {
@@ -27,6 +28,7 @@ public class EndMeeting extends RequestWithChecksum<EndMeeting.Params> {
     private String meetingID;
 
     @PasswordConstraint
+    @NotEmpty(message = "You must provide the moderator password")
     private String password;
 
     @Valid
diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/model/request/JoinMeeting.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/model/request/JoinMeeting.java
index fcdae7f64e..e5d3f75db0 100755
--- a/bbb-common-web/src/main/java/org/bigbluebutton/api/model/request/JoinMeeting.java
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/model/request/JoinMeeting.java
@@ -35,6 +35,7 @@ public class JoinMeeting extends RequestWithChecksum<JoinMeeting.Params> {
     private String fullName;
 
     @PasswordConstraint
+    @NotEmpty(message = "You must provide either the moderator or attendee password")
     private String password;
 
     @IsBooleanConstraint(message = "Guest must be a boolean value (true or false)")