diff --git a/locales/hu.js b/locales/hu.js
index b39f255..0cb2986 100644
--- a/locales/hu.js
+++ b/locales/hu.js
@@ -69,7 +69,7 @@
 	"team_invite_membership_subject": "Csapat meghívó %-s számára",
 	"team_invite_membership_body": "Meghívták a(z) %s oldalra a Spacedeck-en. Kattintson a következő hivatkozásra a meghívás elfogadásához.",
 	"team_invite_user_body": "Meghívták a(z)%s oldalra a Spacedeck-en.\nAz ideiglenes jelszó \"%s\".\n Kérjük, kattintson a következő hivatkozásra a meghívás elfogadásához.",
-	"team_invite_admin_body": "%s meghívást kapott a csapatodba: %s. Az ideiglenes jelszó \ "% s \".",
+	"team_invite_admin_body": "%s meghívást kapott a csapatodba: %s. Az ideiglenes jelszó \"%s\".",
 	"team_invite_membership_acction": "Elfogad",
 	"team_new_member_subject": "A(z) %s új csapattagja feliratkozott",
 	"team_new_member_body": "%s most csatlakozott a(z) %s csoporthoz a Spacedeck-en.",
diff --git a/routes/root.js b/routes/root.js
index f2e1856..6d01608 100644
--- a/routes/root.js
+++ b/routes/root.js
@@ -78,6 +78,22 @@ router.get('/oc', (req, res) => {
   res.redirect("/t/oc");
 });
 
+router.get('/es/*', (req, res) => {
+  res.redirect("/t/es");
+});
+
+router.get('/es', (req, res) => {
+  res.redirect("/t/es");
+});
+
+router.get('/hu/*', (req, res) => {
+  res.redirect("/t/hu");
+});
+
+router.get('/hu', (req, res) => {
+  res.redirect("/t/hu");
+});
+
 router.get('/en/*', (req, res) => {
   res.redirect("/t/en");
 });
diff --git a/spacedeck.js b/spacedeck.js
index 233e21e..a5fb187 100644
--- a/spacedeck.js
+++ b/spacedeck.js
@@ -33,7 +33,7 @@ console.log("Booting Spacedeck Open… (environment: " + app.get('env') + ")");
 app.use(logger(isProduction ? 'combined' : 'dev'));
 
 i18n.expressBind(app, {
-  locales: ["en", "de", "fr", "oc", "es"],
+  locales: ["en", "de", "fr", "oc", "es", "hu"],
   defaultLocale: "en",
   cookieName: "spacedeck_locale",
   devMode: (app.get('env') == 'development')
diff --git a/views/partials/account.html b/views/partials/account.html
index ebffe75..7cc4dc2 100644
--- a/views/partials/account.html
+++ b/views/partials/account.html
@@ -110,7 +110,10 @@
         </label>
         <label class="radio" v-bind:class="{checked: user.prefs_language=='es'}" v-on:click="save_user_language('es')">
           <input type="radio" id="user-preferences_language" name="language" value="es"><span>Español</span>
-        </label>        
+        </label>
+        <label class="radio" v-bind:class="{checked: user.prefs_language=='hu'}" v-on:click="save_user_language('hu')">
+          <input type="radio" id="user-preferences_language" name="language" value="hu"><span>Magyar</span>
+        </label>
       </div>
     </div>
 
diff --git a/views/spacedeck.ejs b/views/spacedeck.ejs
index 9c8b99a..1f29ea1 100644
--- a/views/spacedeck.ejs
+++ b/views/spacedeck.ejs
@@ -18,7 +18,7 @@
         webEndpoint: location.origin,
         apiEndpoint: location.origin,
         websocketsEndpoint: location.origin.replace("https:","wss:").replace("http:","ws:"),
-        options: <%- config.spacedeck ? JSON.stringify(config.spacedeck) : "{}" %>
+        options: <%- config && config.spacedeck ? JSON.stringify(config.spacedeck) : "{}" %>
       };
     </script>
 
@@ -79,10 +79,12 @@
     window.locales.fr = {};
     window.locales.oc = {};
     window.locales.es = {};
+    window.locales.hu = {};
     window.locales.en.translation = <%- include("./../locales/en.js") %>;
     window.locales.de.translation = <%- include("./../locales/de.js") %>;
     window.locales.fr.translation = <%- include("./../locales/fr.js") %>;
     window.locales.oc.translation = <%- include("./../locales/oc.js") %>;
     window.locales.es.translation = <%- include("./../locales/es.js") %>;
+    window.locales.hu.translation = <%- include("./../locales/hu.js") %>;
   </script>
 </html>