diff --git a/app/coffee/app.coffee b/app/coffee/app.coffee
index 077d32f8..5ac84611 100644
--- a/app/coffee/app.coffee
+++ b/app/coffee/app.coffee
@@ -249,7 +249,40 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, $tgEven
     if not window.taigaConfig.debugInfo
         $translateProvider.fallbackLanguage(preferedLangCode)
 
-    moment.locale(preferedLangCode)
+
+i18nInit = (lang, $translate) ->
+    # i18n - moment.js
+    moment.locale(lang)
+
+    # i18n - checksley.js
+    messages = {
+        defaultMessage: $translate.instant("COMMON.FORM_ERRORS.DEFAULT_MESSAGE")
+        type: {
+            email: $translate.instant("COMMON.FORM_ERRORS.TYPE_EMAIL")
+            url: $translate.instant("COMMON.FORM_ERRORS.TYPE_URL")
+            urlstrict: $translate.instant("COMMON.FORM_ERRORS.TYPE_URLSTRICT")
+            number: $translate.instant("COMMON.FORM_ERRORS.TYPE_NUMBER")
+            digits: $translate.instant("COMMON.FORM_ERRORS.TYPE_DIGITS")
+            dateIso: $translate.instant("COMMON.FORM_ERRORS.TYPE_DATEISO")
+            alphanum: $translate.instant("COMMON.FORM_ERRORS.TYPE_ALPHANUM")
+            phone: $translate.instant("COMMON.FORM_ERRORS.TYPE_PHONE")
+        }
+        notnull: $translate.instant("COMMON.FORM_ERRORS.NOTNULL")
+        notblank: $translate.instant("COMMON.FORM_ERRORS.NOT_BLANK")
+        required: $translate.instant("COMMON.FORM_ERRORS.REQUIRED")
+        regexp: $translate.instant("COMMON.FORM_ERRORS.REGEXP")
+        min: $translate.instant("COMMON.FORM_ERRORS.MIN")
+        max: $translate.instant("COMMON.FORM_ERRORS.MAX")
+        range: $translate.instant("COMMON.FORM_ERRORS.RANGE")
+        minlength: $translate.instant("COMMON.FORM_ERRORS.MIN_LENGTH")
+        maxlength: $translate.instant("COMMON.FORM_ERRORS.MAX_LENGTH")
+        rangelength: $translate.instant("COMMON.FORM_ERRORS.RANGE_LENGTH")
+        mincheck: $translate.instant("COMMON.FORM_ERRORS.MIN_CHECK")
+        maxcheck: $translate.instant("COMMON.FORM_ERRORS.MAX_CHECK")
+        rangecheck: $translate.instant("COMMON.FORM_ERRORS.RANGE_CHECK")
+        equalto: $translate.instant("COMMON.FORM_ERRORS.EQUAL_TO")
+    }
+    checksley.updateMessages('default', messages)
 
 
 init = ($log, $config, $rootscope, $auth, $events, $analytics, $translate) ->
@@ -260,41 +293,10 @@ init = ($log, $config, $rootscope, $auth, $events, $analytics, $translate) ->
     $rootscope.adminPlugins = _.where(@.taigaContribPlugins, {"type": "admin"})
 
     # i18n
-    $rootscope.$on "$translateChangeEnd", (ctx) ->
+    #$rootscope.$on "$translateChangeEnd", (ctx) ->
+    $rootscope.$on "$translateLoadingEnd'", (ctx) ->
         lang = ctx.language
-
-        # i18n - moment.js
-        moment.locale(lang)
-
-        # i18n - checksley.js
-        messages = {
-            defaultMessage: $translate.instant("COMMON.FORM_ERRORS.DEFAULT_MESSAGE")
-            type: {
-                email: $translate.instant("COMMON.FORM_ERRORS.TYPE_EMAIL")
-                url: $translate.instant("COMMON.FORM_ERRORS.TYPE_URL")
-                urlstrict: $translate.instant("COMMON.FORM_ERRORS.TYPE_URLSTRICT")
-                number: $translate.instant("COMMON.FORM_ERRORS.TYPE_NUMBER")
-                digits: $translate.instant("COMMON.FORM_ERRORS.TYPE_DIGITS")
-                dateIso: $translate.instant("COMMON.FORM_ERRORS.TYPE_DATEISO")
-                alphanum: $translate.instant("COMMON.FORM_ERRORS.TYPE_ALPHANUM")
-                phone: $translate.instant("COMMON.FORM_ERRORS.TYPE_PHONE")
-            }
-            notnull: $translate.instant("COMMON.FORM_ERRORS.NOTNULL")
-            notblank: $translate.instant("COMMON.FORM_ERRORS.NOT_BLANK")
-            required: $translate.instant("COMMON.FORM_ERRORS.REQUIRED")
-            regexp: $translate.instant("COMMON.FORM_ERRORS.REGEXP")
-            min: $translate.instant("COMMON.FORM_ERRORS.MIN")
-            max: $translate.instant("COMMON.FORM_ERRORS.MAX")
-            range: $translate.instant("COMMON.FORM_ERRORS.RANGE")
-            minlength: $translate.instant("COMMON.FORM_ERRORS.MIN_LENGTH")
-            maxlength: $translate.instant("COMMON.FORM_ERRORS.MAX_LENGTH")
-            rangelength: $translate.instant("COMMON.FORM_ERRORS.RANGE_LENGTH")
-            mincheck: $translate.instant("COMMON.FORM_ERRORS.MIN_CHECK")
-            maxcheck: $translate.instant("COMMON.FORM_ERRORS.MAX_CHECK")
-            rangecheck: $translate.instant("COMMON.FORM_ERRORS.RANGE_CHECK")
-            equalto: $translate.instant("COMMON.FORM_ERRORS.EQUAL_TO")
-        }
-        checksley.updateMessages('default', messages)
+        i18nInit(lang, $translate)
 
     # Load user
     if $auth.isAuthenticated()