diff --git a/app/assets/javascripts/landing.js b/app/assets/javascripts/landing.js
index 5c9156f1..eb38db9d 100644
--- a/app/assets/javascripts/landing.js
+++ b/app/assets/javascripts/landing.js
@@ -140,7 +140,12 @@
       $(".page-wrapper.meetings").data('id', newId);
       $('.meeting-url').val(Meeting.getInstance().getURL());
       $('.join-meeting-title').html(I18n.join_title.replace(/%{id}/, newId));
-    })
+      if (newId === '') {
+        $('.invite-join-wrapper').addClass('hidden');
+      } else {
+        $('.invite-join-wrapper').removeClass('hidden');
+      }
+    });
 
     // enable tooltips
     var options = {
diff --git a/app/assets/javascripts/meeting.coffee b/app/assets/javascripts/meeting.coffee
index 9b13a1a4..b0a6e193 100644
--- a/app/assets/javascripts/meeting.coffee
+++ b/app/assets/javascripts/meeting.coffee
@@ -36,7 +36,7 @@ class @Meeting
     _meetingInstance = null
 
   @buildMeetingURL: (id, type) ->
-    return @buildFullDomainURL() + '/' + type + '/' + id
+    return @buildFullDomainURL() + '/' + type + '/' + encodeURIComponent(id)
 
   @buildFullDomainURL: ->
     url = location.protocol + '//' + location.hostname
diff --git a/app/views/landing/index.html.erb b/app/views/landing/index.html.erb
index 3bd3f593..c61793f0 100644
--- a/app/views/landing/index.html.erb
+++ b/app/views/landing/index.html.erb
@@ -36,7 +36,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
             </div>
           </div>
 
-          <div class="row invite-join-wrapper">
+          <div class="row invite-join-wrapper hidden">
             <div class="col-xs-6">
               <div class="title-wrapper text-center">
                 <div class="title-invite">