diff --git a/srv.js b/srv.js
index a18af5bea4579e17b57e42edffa8e5d440c581b2..b00bf932ee1547e903bc2a14fb9dbe558de1ff85 100755
--- a/srv.js
+++ b/srv.js
@@ -14,9 +14,16 @@ app.set('view engine', 'pug');
 app.use(express.static('./static'));
 
 app.use(function(req, res, next) {
-  let locale = req.headers['accept-language'] || '';
+  let locale = req.query.lang || req.headers['accept-language'] || '';
   req.i18n = new i18n();
-  req.i18n.setLocale(locale.indexOf('en') !== -1 && locale.indexOf('en') < locale.indexOf('fr') ? 'en' : 'fr');
+  if (locale.indexOf('en') !== -1
+      && locale.indexOf('fr') !== -1)
+    req.i18n.setLocale(locale.indexOf('en') < locale.indexOf('fr') ? 'en' : 'fr');
+  else if (locale.indexOf('en') !== -1
+	   && locale.indexOf('fr') === -1)
+    req.i18n.setLocale('en');
+  else
+    req.i18n.setLocale('fr');
   next();
 });
 
diff --git a/static/canvas.js b/static/canvas.js
index 63a4b3cfe6f213c91e92ef9324e62afa598ef3d5..01559c22c418525d8e8baaa03474d4308d38a265 100644
--- a/static/canvas.js
+++ b/static/canvas.js
@@ -18,6 +18,14 @@ let width = canvas.width;
 let height = canvas.height;
 let fontSize = 44;
 
+let params = {};
+if (window.location.search) {
+  let splitParams = window.location.search.split('?')[1].split('&');
+  for (let i in splitParams) {
+    params[splitParams[i].split('=')[0]] = decodeURIComponent(splitParams[i].split('=')[1]);
+  }
+}
+
 let get = function(url, cb) {
   let xmlHttp = new XMLHttpRequest();
   xmlHttp.onreadystatechange = function() {
@@ -40,7 +48,7 @@ let getImage = function(id, cb) {
 }
 
 let language = function() {
-  return navigator.language.indexOf('en') !== -1 ? 'en' : 'fr';
+  return (params.lang || navigator.language).indexOf('en') !== -1 ? 'en' : 'fr';
 }
 
 let _ = function(str) {
@@ -144,25 +152,18 @@ window.addEventListener('load', function() {
   document.querySelector('nav > a[href="' + hash + '"]').click();
 
   // Update inputs depending on URL params
-  if (window.location.search) {
-    let splitParams = window.location.search.split('?')[1].split('&');
-    let params = {};
-    for (let i in splitParams) {
-      params[splitParams[i].split('=')[0]] = decodeURIComponent(splitParams[i].split('=')[1]);
-    }
-    if (params['bgColor'])
-      document.querySelector('.colorpicker input[name="bgColor"][value="' + params['bgColor'] + '"]').checked = true;
-    if (params['fgColor'])
-      document.querySelector('.colorpicker input[name="fgColor"][value="' + params['fgColor'] + '"]').checked = true;
-    if (params['text'])
-      document.getElementById('step2value').value = document.getElementById('step2value').innerText = params['text'];
-    if (params['font'])
-      document.querySelector('input[name="font"][value="' + params['font'] + '"]').checked = true;
-    if (params['icon'])
-      document.querySelector('input[name="icon"][value="' + params['icon'] + '"]').checked = true;
-    if (params['signature'])
-      document.getElementById('signature').value = params['signature'];
-  }
+  if (params['bgColor'])
+    document.querySelector('.colorpicker input[name="bgColor"][value="' + params['bgColor'] + '"]').checked = true;
+  if (params['fgColor'])
+    document.querySelector('.colorpicker input[name="fgColor"][value="' + params['fgColor'] + '"]').checked = true;
+  if (params['text'])
+    document.getElementById('step2value').value = document.getElementById('step2value').innerText = params['text'];
+  if (params['font'])
+    document.querySelector('input[name="font"][value="' + params['font'] + '"]').checked = true;
+  if (params['icon'])
+    document.querySelector('input[name="icon"][value="' + params['icon'] + '"]').checked = true;
+  if (params['signature'])
+    document.getElementById('signature').value = params['signature'];
 
   // Add event listeners to inputs
   let inputs = document.querySelectorAll('.colorpicker input[type="radio"], #step3 input[type="radio"], #step4 input[type="radio"]');