diff --git a/frontend/drupal/sites/all/themes/pro1ka/js/script.js b/frontend/drupal/sites/all/themes/pro1ka/js/script.js
index 6d02194b5..c252b95df 100644
--- a/frontend/drupal/sites/all/themes/pro1ka/js/script.js
+++ b/frontend/drupal/sites/all/themes/pro1ka/js/script.js
@@ -636,6 +636,14 @@
           posodobiCenoPaketa();
         });
 
+        // V kolikor gre za e-račun
+        jQuery('[name="podjetje_eracun"]').on('click', function(){
+          if(jQuery('[name="podjetje_eracun"]').is(':checked')){
+            jQuery('.p-e-racun').show();
+          } else {
+            jQuery('.p-e-racun').hide();
+          }
+        });
 
         jQuery('#narocilo-paketa-podatki .naprej').on('click', function (e) {
           e.preventDefault();
@@ -852,6 +860,15 @@
           posodobiCenoPaketa();
         });
 
+        jQuery('#nakup-1ka #polje-drzava').on('change', function(){
+          if(jQuery(this).val() == 'Slovenija' || jQuery(this).val() == 'Slovenia'){
+            jQuery('#nakup-1ka #polje-podjetje-eracun').show();
+          } else {
+            jQuery('#nakup-1ka #polje-podjetje-eracun').hide();
+            jQuery('[name="podjetje_eracun"]').prop('checked', false);
+          }
+        });
+
         jQuery('[name="podjetje_davcna"]').keyup(function () {
           var davcna = jQuery('[name="podjetje_davcna"]').val().replace(/\D/g, ''); // samo številke
 
diff --git a/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-kosarica.tpl.php b/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-kosarica.tpl.php
index fbf82db15..5c32c762f 100644
--- a/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-kosarica.tpl.php
+++ b/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-kosarica.tpl.php
@@ -459,7 +459,7 @@
             );?>
             <div class="w-clearfix">
               <div class="col _3-3-3-12">
-                <select name="podjetje_drzava" class="input-field w-input polje-za-podjetje">
+                <select name="podjetje_drzava" class="input-field w-input polje-za-podjetje" id="polje-drzava">
                     <option value="" disabled="disabled" <?php printf ($language->language != 'sl' ? 'selected="selected"' : ''); ?>> - <?php printf ($language->language == 'sl' ? 'Izberite državo' : 'Select a country'); ?> -</option>
                   <?php foreach($country_list as  $country): ?>
                     <option value="<?php  printf($country); ?>" <?php printf ($language->language == 'sl' && $country == 'Slovenija' ? 'selected="selected"' : ''); ?>><?php printf($country); ?></option>
@@ -467,8 +467,29 @@
                 </select>
               </div>
             </div>
+
+
+              <div class="w-clearfix">
+                <div class="col _3-3-3-12">
+                  <div class="checkbox-field w-checkbox polje-za-podjetje" id="polje-podjetje-eracun" style="display: none;">
+                    <input type="checkbox" name="podjetje_eracun" value="1" class="cb w-checkbox-input" id="podjetje_eracun">
+                    <span class="checkbox-display checkbox-podjetje-eracun"></span>
+                    <span>
+                      <label for="podjetje_eracun" class="checkbox-label w-form-label">
+                        <?php if ($language->language == 'sl'): ?>
+                          Potrebujem e-račun (proračunski uporabnik)
+                        <?php else: ?>
+                          I need an e-invoice (budget user)
+                        <?php endif; ?>
+                      </label>
+                    </span>
+                  </div>
+                </div>
+              </div>
+
           </div>
 
+
           <div class="w-clearfix">
             <div class="col _3-3-3-12">
               <input type="text" id="f-telefon" class="input-field w-input " name="phone" value="" size="30"
@@ -628,6 +649,15 @@
           <?php endif; ?>
           <span id="forma-p-ddv">/</span>  <span class="zavezanec-za-ddv">(<?php printf ($language->language == 'sl' ? 'podjetje je zavezanec za DDV' : 'VAT-registered user'); ?>)</span>
         </div>
+
+        <div class="col p-e-racun" style="display: none;">
+          <?php if ($language->language == 'sl'): ?>
+            E-račun (proračunski uporabnik): <span>Da</span>
+          <?php else: ?>
+            E-invoice (budget user):  <span>Yes</span>
+          <?php endif; ?>
+        </div>
+
         <div class="col">
           <?php if ($language->language == 'sl'): ?>
             Naslov: