diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/UserSession.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/UserSession.java
index b271e60de8..50e74accbc 100755
--- a/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/UserSession.java
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/UserSession.java
@@ -44,6 +44,8 @@ public class UserSession {
   public String avatarURL;
   public String configXML;
   public String guestStatus = GuestPolicy.ALLOW;
+  public Boolean joinViaHtml5 = false;
+
   private AtomicInteger connections = new AtomicInteger(0);
   
  
diff --git a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
index 444cfde428..98ac578b87 100755
--- a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
+++ b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
@@ -419,6 +419,7 @@ class ApiController {
     us.guestStatus = guestStatusVal
     us.logoutUrl = meeting.getLogoutUrl()
     us.configXML = configxml;
+    us.joinViaHtml5 = joinViaHtml5
 
     if (!StringUtils.isEmpty(params.defaultLayout)) {
       us.defaultLayout = params.defaultLayout;
@@ -1297,9 +1298,16 @@ class ApiController {
 
       String msgKey = "guestAllowed"
       String msgValue = "Guest allowed to join meeting."
+
+      // Check if the user should join using html5
+      if (us.joinViaHtml5) {
+        clientURL = paramsProcessorUtil.getHTML5ClientUrl();
+      }
+
       String destUrl = clientURL + "?sessionToken=" + sessionToken
       log.debug("destUrl = " + destUrl)
 
+
       if (guestWaitStatus.equals(GuestPolicy.WAIT)) {
         clientURL = paramsProcessorUtil.getDefaultGuestWaitURL();
         destUrl = clientURL + "?sessionToken=" + sessionToken