diff --git a/app/config/locales.php b/app/config/locales.php
index 559aab42a..325913631 100644
--- a/app/config/locales.php
+++ b/app/config/locales.php
@@ -10,6 +10,7 @@ return [
     'en', // English
     'es', // Spanish
     'fi', // Finnish
+    'fo', // Faroese
     'fr', // French
     'gr', // Greek
     'he', // Hebrew
diff --git a/app/config/locale/fo.continents.php b/app/config/locales/fo.continents.php
similarity index 100%
rename from app/config/locale/fo.continents.php
rename to app/config/locales/fo.continents.php
diff --git a/app/config/locale/fo.countries.php b/app/config/locales/fo.countries.php
similarity index 100%
rename from app/config/locale/fo.countries.php
rename to app/config/locales/fo.countries.php
diff --git a/app/config/locale/fo.php b/app/config/locales/fo.php
similarity index 73%
rename from app/config/locale/fo.php
rename to app/config/locales/fo.php
index 3388cce71..389fc10d1 100644
--- a/app/config/locale/fo.php
+++ b/app/config/locales/fo.php
@@ -8,14 +8,14 @@ return [
     // Service - Users
     'auth.emails.team' => '%s Lið',
     'auth.emails.confirm.title' => 'Vátta brúkari',
-    'auth.emails.confirm.body' => 'en.email.auth.confirm.tpl',
+    'auth.emails.confirm.body' => 'fo.email.auth.confirm.tpl',
     'auth.emails.recovery.title' => 'Glómt passord',
     'auth.emails.recovery.body' => 'fo.email.auth.recovery.tpl',
     'auth.emails.invitation.title' => 'Innbjóðing til %s Lið hjá %s',
-    'auth.emails.invitation.body' => 'no.email.auth.invitation.tpl',
+    'auth.emails.invitation.body' => 'fo.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'Ókjent',
 
-    'countries' => include 'en.countries.php',
-    'continents' => include 'en.continents.php',
+    'countries' => include 'fo.countries.php',
+    'continents' => include 'fo.continents.php',
 ];
diff --git a/app/config/locale/templates/fo.email.auth.confirm.tpl b/app/config/locales/templates/fo.email.auth.confirm.tpl
similarity index 100%
rename from app/config/locale/templates/fo.email.auth.confirm.tpl
rename to app/config/locales/templates/fo.email.auth.confirm.tpl
diff --git a/app/config/locale/templates/fo.email.auth.invitation.tpl b/app/config/locales/templates/fo.email.auth.invitation.tpl
similarity index 100%
rename from app/config/locale/templates/fo.email.auth.invitation.tpl
rename to app/config/locales/templates/fo.email.auth.invitation.tpl
diff --git a/app/config/locale/templates/fo.email.auth.recovery.tpl b/app/config/locales/templates/fo.email.auth.recovery.tpl
similarity index 100%
rename from app/config/locale/templates/fo.email.auth.recovery.tpl
rename to app/config/locales/templates/fo.email.auth.recovery.tpl
diff --git a/app/init.php b/app/init.php
index c10aace82..47a688fb6 100644
--- a/app/init.php
+++ b/app/init.php
@@ -137,6 +137,7 @@ Locale::setLanguage('de', include __DIR__.'/config/locales/de.php');
 Locale::setLanguage('en', include __DIR__.'/config/locales/en.php');
 Locale::setLanguage('es', include __DIR__.'/config/locales/es.php');
 Locale::setLanguage('fi', include __DIR__.'/config/locales/fi.php');
+Locale::setLanguage('fo', include __DIR__.'/config/locales/fo.php');
 Locale::setLanguage('fr', include __DIR__.'/config/locales/fr.php');
 Locale::setLanguage('gr', include __DIR__.'/config/locales/gr.php');
 Locale::setLanguage('he', include __DIR__.'/config/locales/he.php');