diff --git a/frontend/api/class.ApiLogin.php b/frontend/api/class.ApiLogin.php
index d04296f3d..4b036345b 100644
--- a/frontend/api/class.ApiLogin.php
+++ b/frontend/api/class.ApiLogin.php
@@ -416,8 +416,19 @@ class ApiLogin
         global $cookie_domain;
         global $originating_domain;
         global $keep_domain;
+        global $app_settings;
 
 
+        // Ce imamo vklopljeno blokiranje dostopa do admina glede na ip
+        if(isset($app_settings['admin_allow_only_ip']) && $app_settings['admin_allow_only_ip'] != '' && !empty($app_settings['admin_allow_only_ip'])){
+
+            // Preverimo ip - ce se ne ujema ne pustimo logina
+            if(!in_array($_SERVER['REMOTE_ADDR'], $app_settings['admin_allow_only_ip'])){
+                header('location: '.$this->page_urls['page_login'.$this->prijava]);
+                die();
+            }
+        }
+        
         $mini = $this->email.$this->pass;
         for ($Stevec = 0; $Stevec < strlen($mini); $Stevec++) {
             $mini = str_replace("'", "", $mini);
diff --git a/settings_optional.php.example b/settings_optional.php.example
index 9b953375e..1696f963e 100644
--- a/settings_optional.php.example
+++ b/settings_optional.php.example
@@ -36,6 +36,8 @@ $app_settings = array(
 
     'survey_finish_url'         => '',          // Skok na url po koncani anketi (ce je prazno se uporabi default www.1ka.si)
 
+    'admin_allow_only_ip'       => '',          // Dovolimo dostop do admina samo dolocenim ip-jem (array ip-jev)
+
     'export_type'               => 'old',       // Uporaba novih ("new") / novih samo za admine ("new_admin") / starih ("old") izvozov
 
     'commercial_packages'       => false        // Ce so vklopljeni komercialni paketi