diff --git a/client/src/locales/fi-FI/core.js b/client/src/locales/fi-FI/core.js
index 1e6d40f1..3ae002a4 100644
--- a/client/src/locales/fi-FI/core.js
+++ b/client/src/locales/fi-FI/core.js
@@ -1,6 +1,11 @@
+import dateFns from 'date-fns/locale/fi';
+import timeAgo from 'javascript-time-ago/locale/fi';
+
 import markdownEditor from './markdown-editor.json';
 
 export default {
+  dateFns,
+  timeAgo,
   markdownEditor,
 
   format: {
diff --git a/client/src/locales/fi-FI/index.js b/client/src/locales/fi-FI/index.js
index df152a75..b30addcf 100644
--- a/client/src/locales/fi-FI/index.js
+++ b/client/src/locales/fi-FI/index.js
@@ -1,11 +1,8 @@
-import merge from 'lodash/merge';
-
 import login from './login';
-import core from './core';
 
 export default {
   language: 'fi-FI',
   country: 'fi',
   name: 'Suomi',
-  embeddedLocale: merge(login, core),
+  embeddedLocale: login,
 };
diff --git a/client/src/locales/index.js b/client/src/locales/index.js
index a216916f..03086252 100644
--- a/client/src/locales/index.js
+++ b/client/src/locales/index.js
@@ -13,13 +13,13 @@ import enGB from './en-GB';
 import enUS from './en-US';
 import esES from './es-ES';
 import faIR from './fa-IR';
+import fiFI from './fi-FI';
 import frFR from './fr-FR';
 import huHU from './hu-HU';
 import idID from './id-ID';
 import itIT from './it-IT';
 import jaJP from './ja-JP';
 import koKR from './ko-KR';
-import fiFI from './fi-FI';
 import nlNL from './nl-NL';
 import plPL from './pl-PL';
 import ptBR from './pt-BR';
@@ -46,6 +46,7 @@ const locales = [
   enUS,
   esES,
   faIR,
+  fiFI,
   frFR,
   huHU,
   idID,
@@ -58,7 +59,6 @@ const locales = [
   roRO,
   ruRU,
   skSK,
-  fiFI,
   srCyrlRS,
   srLatnRS,
   svSE,
diff --git a/server/api/models/User.js b/server/api/models/User.js
index e32d1f72..7659ea95 100755
--- a/server/api/models/User.js
+++ b/server/api/models/User.js
@@ -44,6 +44,7 @@ const LANGUAGES = [
   'en-US',
   'es-ES',
   'fa-IR',
+  'fi-FI',
   'fr-FR',
   'hu-HU',
   'id-ID',
@@ -56,7 +57,6 @@ const LANGUAGES = [
   'ro-RO',
   'ru-RU',
   'sk-SK',
-  'fi-FI',
   'sr-Cyrl-RS',
   'sr-Latn-RS',
   'sv-SE',