diff --git a/frontend/payments/classes/class.UserNarocila.php b/frontend/payments/classes/class.UserNarocila.php
index 3eed99e29..bfc3281c0 100644
--- a/frontend/payments/classes/class.UserNarocila.php
+++ b/frontend/payments/classes/class.UserNarocila.php
@@ -266,7 +266,7 @@ class UserNarocila{
 
         // Ce ni polja v bazi oz je nastavljen paket na 1 ima osnovni paket
         if(!$user_access || $user_access['package_id'] == '1'){
-            echo '<p>'.$lang['srv_narocila_no_package'].'.</p>';
+            echo '<p>'.$lang['srv_narocila_current_package'].':</span> <span class="bold">1KA</span></p>';
         }
         // Imamo aktiviran paket - izpisemo podatke
         else{
@@ -282,7 +282,14 @@ class UserNarocila{
         echo '<fieldset>';
         echo '<legend>'.$lang['srv_narocila_list'].'</legend>'; 
 
-        $this->displayNarocilaTable();
+        $sqlNarocilaCount = sisplet_query("SELECT count(id) FROM user_access_narocilo WHERE usr_id='".$global_user_id."'");
+        $rowNarocilaCount = mysqli_fetch_array($sqlNarocilaCount);
+        if($rowNarocilaCount['count(id)'] > 0){
+            $this->displayNarocilaTable();
+        }
+        else{
+            echo '<p>'.$lang['srv_narocila_no_package_text'].'</p>';
+        }
 
         echo '</fieldset>';
     }
diff --git a/lang/1.php b/lang/1.php
index 0c855545d..b5de339fd 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -7446,6 +7446,7 @@ $lang = array (
     'srv_narocila_current_start'        => "Aktiviran",
     'srv_narocila_current_expire'       => "Poteče",
     'srv_narocila_no_package'           => "Brez paketa",
+    'srv_narocila_no_package_text'      => "Ni bilo opravljeno še nobeno naročilo.",
 
     'srv_narocilo_number'               => "Naročilo št.",
     'srv_narocilo_ime'                  => "Ime",
diff --git a/lang/2.php b/lang/2.php
index 854686884..2fefbca33 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -7333,6 +7333,7 @@ $lang = array (
     'srv_narocila_current_start'        => "Activated",
     'srv_narocila_current_expire'       => "Expire",
     'srv_narocila_no_package'           => "Without package",
+    'srv_narocila_no_package_text'      => "No orders have been placed yet. ",
 
     'srv_narocilo_number'               => "Order no.",
     'srv_narocilo_ime'                  => "Name",