diff --git a/frontend/drupal9/web/modules/custom/registracija_1ka/registracija_1ka.module b/frontend/drupal9/web/modules/custom/registracija_1ka/registracija_1ka.module
index 1dbcc50eb..9782adda7 100644
--- a/frontend/drupal9/web/modules/custom/registracija_1ka/registracija_1ka.module
+++ b/frontend/drupal9/web/modules/custom/registracija_1ka/registracija_1ka.module
@@ -9,19 +9,9 @@
  */
 function registracija_1ka_theme()
 {
-  if(\Drupal::languageManager()->getCurrentLanguage()->getId() == 'sl') {
-    include(__DIR__ . '/../../../../../../lang/1.php');
-  }else{
-    include(__DIR__ . '/../../../../../../lang/2.php');
-  }
-
-
 //    $lang['cms_register_user_text'] = str_replace('GOOGLE_URL', variable_get('1ka_google_prijava'), $lang['cms_register_user_text']);
 //    $lang['cms_register_user_text'] = str_replace('FACEBOOK_URL', variable_get('1ka_facebook_prijava'), $lang['cms_register_user_text']);
 
-    // Naložimo 1ka nastavitve
-    require($_SERVER['DOCUMENT_ROOT'] . '/settings.php');
-
 
     /**
      * Dodatne opcijske nastavitve
@@ -39,11 +29,11 @@ function registracija_1ka_theme()
     return [
         'registracija_block' => [
             'variables' => [
-                'lang' => $lang ?? [],
-                'jezik' => \Drupal::languageManager()->getCurrentLanguage()->getId(),
+                'lang' => [],
+                'jezik' => '',
                 //'obvestila' => $obvestila,
-                'recaptcha_sitekey' => $recaptcha_sitekey ?? '',
-                'login__link' => (isset($lang['cms_register_login_link']) ? str_replace('#URL#', '#', $lang['cms_register_login_link']) : '')
+                'recaptcha_sitekey' => '',
+                'login__link' => '',
            ]
         ]
     ];
diff --git a/frontend/drupal9/web/modules/custom/registracija_1ka/src/Plugin/Block/RegistracijaBlock.php b/frontend/drupal9/web/modules/custom/registracija_1ka/src/Plugin/Block/RegistracijaBlock.php
index 14706d8e0..4ee072921 100644
--- a/frontend/drupal9/web/modules/custom/registracija_1ka/src/Plugin/Block/RegistracijaBlock.php
+++ b/frontend/drupal9/web/modules/custom/registracija_1ka/src/Plugin/Block/RegistracijaBlock.php
@@ -19,8 +19,23 @@ class RegistracijaBlock extends BlockBase {
    * {@inheritdoc}
    */
   public function build() {
+    $currentLanguage = \Drupal::languageManager()->getCurrentLanguage()->getId();
+
+    if($currentLanguage == 'sl') {
+      include(__DIR__ . '../../../../../../../../../lang/1.php');
+    } else{
+      include(__DIR__ . '../../../../../../../../../lang/2.php');
+    }
+
+    // Naložimo 1ka nastavitve
+    require($_SERVER['DOCUMENT_ROOT'] . '/settings.php');
+
     return [
       '#theme' => 'registracija_block',
+      '#lang' => $lang ?? [],
+      '#jezik' => $currentLanguage,
+      '#recaptcha_sitekey' => $recaptcha_sitekey ?? '',
+      '#login__link' => (isset($lang['cms_register_login_link']) ? str_replace('#URL#', '#', $lang['cms_register_login_link']) : ''),
     ];
   }
 
@@ -29,4 +44,3 @@ class RegistracijaBlock extends BlockBase {
   }
 
 }
-