diff --git a/bbb-api-demo/src/main/webapp/bbb_api.jsp b/bbb-api-demo/src/main/webapp/bbb_api.jsp
index 160d5804b51aa40fd33ffda812c844bc6d8b7034..2c643541ea03c580869e0dd9bde3b6f4f46cd922 100755
--- a/bbb-api-demo/src/main/webapp/bbb_api.jsp
+++ b/bbb-api-demo/src/main/webapp/bbb_api.jsp
@@ -150,7 +150,7 @@ public String getJoinMeetingURL(String username, String meetingID, String passwo
 //
 //  Note this meeting will use username for meetingID
 
-public String getJoinURL(String username, String meetingID, String record, String welcome, Map<String, String> metadata, String xml, String pw) {
+public String getJoinURL(String username, String meetingID, String record, String welcome, Map<String, String> metadata, String xml) {
 	String base_url_create = BigBlueButtonURL + "api/create?";
 	String base_url_join = BigBlueButtonURL + "api/join?";
 
@@ -260,7 +260,7 @@ public String getJoinURLXML(String username, String meetingID, String welcome, S
 			.trim().equals("SUCCESS")) {
 
 		String join_parameters = "meetingID=" + urlEncode(meetingID)
-			+ "&fullName=" + urlEncode(username) + "&password=" + pw;
+			+ "&fullName=" + urlEncode(username) + "&password=mp";
 
 		return base_url_join + join_parameters + "&checksum="
 			+ checksum("join" + join_parameters + salt);
diff --git a/bbb-api-demo/src/main/webapp/demo1.jsp b/bbb-api-demo/src/main/webapp/demo1.jsp
index 695384f9667e51ce4c3ba55cfbeaa21e9e6a146f..a4b8055c18230f759e994baad09d85184d80b92b 100755
--- a/bbb-api-demo/src/main/webapp/demo1.jsp
+++ b/bbb-api-demo/src/main/webapp/demo1.jsp
@@ -91,12 +91,7 @@ if (request.getParameterMap().isEmpty()) {
 	
 	String username = request.getParameter("username");
 	
-	String joinURL = null;
-	
-	if(!username.startsWith("viewer")) 
-		joinURL = getJoinURL(request.getParameter("username"), "Demo Meeting", "false", null, null, null, "mp");
-	else
-		joinURL = getJoinURL(request.getParameter("username"), "Demo Meeting", "false", null, null, null, "ap");
+	String joinURL = getJoinURL(request.getParameter("username"), "Demo Meeting", "false", null, null, null);
 
 	if (joinURL.startsWith("http://")) { 
 %>