diff --git a/public/js/vroom.js b/public/js/vroom.js
index da22423..9e04774 100644
--- a/public/js/vroom.js
+++ b/public/js/vroom.js
@@ -41,14 +41,14 @@ $.ajaxSetup({
 });
 
 // Handle lang switch
-$('#langSwitch').change(function(){
+$('#switch_lang').change(function(){
     $.ajax({
     url: rootUrl + 'api',
     data: {
       req: JSON.stringify({
         action: 'switch_lang',
         param : {
-          language: $('#langSwitch').val()
+          language: $('#switch_lang').val()
         }
       })
     },
diff --git a/templates/default/join.html.ep b/templates/default/join.html.ep
index b9cc1a8..ba4b069 100644
--- a/templates/default/join.html.ep
+++ b/templates/default/join.html.ep
@@ -254,7 +254,7 @@
             </button>
           </div>
           <div class="btn-group">
-            <select class="form-control " id="langSwitch">
+            <select class="form-control" id="switch_lang">
               <% foreach my $lang (qw(en fr)){ %>
               <option value="<%= $lang %>" <%= ($self->languages eq $lang) ? 'selected="selected"' : '' %>>
                 <%= $lang %>
diff --git a/templates/default/public_toolbar.html.ep b/templates/default/public_toolbar.html.ep
index 74a742d..66cabc7 100644
--- a/templates/default/public_toolbar.html.ep
+++ b/templates/default/public_toolbar.html.ep
@@ -27,7 +27,7 @@
             <a href="<%= $self->get_url('/feedback') %>"><%=l 'FEEDBACK' %></a>
           </li>
           <li>
-            <select class="form-control navbar-btn" id="langSwitch">
+            <select class="form-control navbar-btn" id="switch_lang">
               <% foreach my $lang (qw(en fr)){ %>
               <option value="<%= $lang %>" <%= ($self->languages eq $lang) ? 'selected="selected"' : '' %>>
                 <%= $lang %>