diff --git a/eu_cookie_compliance.admin.inc b/eu_cookie_compliance.admin.inc
index a464d77..bb9ff51 100755
--- a/eu_cookie_compliance.admin.inc
+++ b/eu_cookie_compliance.admin.inc
@@ -7,11 +7,20 @@
 /**
  * Provides form for cookie control popup.
  */
-function eu_cookie_compliance_admin_form($form_state) {
+function eu_cookie_compliance_admin_form($form, $form_state) {
 
   global $language;
-  $ln = $language->language;
-  $popup_settings = eu_cookie_compliance_get_settings();
+  $form_language = $language;
+  $ln = $form_language->language;
+
+  if (isset($form_state['build_info']['args'][0]) && $ln = $form_state['build_info']['args'][0]) {
+    $languages = language_list();
+    $form_language = (!empty($languages[$ln]) ? $languages[$ln] : $form_language);
+  }
+
+  $form['#language'] = $form_language;
+
+  $popup_settings = eu_cookie_compliance_get_settings($ln);
 
   $form['eu_cookie_compliance_domain'] = array(
     '#type' => 'textfield',
@@ -33,7 +42,7 @@ function eu_cookie_compliance_admin_form($form_state) {
   );
 
   if (module_exists('locale')) {
-    $form['eu_cookie_compliance_' . $ln]['#title'] = t('You are editing settings for the %language language.', array('%language' => $language->name));
+    $form['eu_cookie_compliance_' . $ln]['#title'] = t('You are editing settings for the %language language.', array('%language' => $form_language->name));
   }
 
   $form['eu_cookie_compliance_' . $ln]['popup_enabled'] = array(
@@ -226,8 +235,9 @@ function eu_cookie_compliance_admin_form($form_state) {
  * Validates form for cookie controll popup.
  */
 function eu_cookie_compliance_admin_form_validate($form, &$form_state) {
-  global $language;
-  $ln = $language-> language;
+  $form_language = $form['#language'];
+
+  $ln = $form_language->language;
   if (!preg_match('/^[1-9][0-9]{0,4}$/', $form_state['values']['eu_cookie_compliance_' . $ln]['popup_height']) && !empty($form_state['values']['eu_cookie_compliance_' . $ln]['popup_height'])) {
     form_set_error('eu_cookie_compliance_' . $ln . '][popup_height', t('Height must be an integer value .'));
   }
@@ -245,7 +255,7 @@ function eu_cookie_compliance_admin_form_validate($form, &$form_state) {
     form_set_error('eu_cookie_compliance_' . $ln . '][popup_link', t('Looks like your privacy policy link contains fragment #, you should make this an absolute url eg @link', array('@link' => $popup_link)));
   }
 
-  cache_clear_all('eu_cookie_compliance_client_settings_' . $language->language, 'cache');
+  cache_clear_all('eu_cookie_compliance_client_settings_' . $ln, 'cache');
 }
 
 /**
diff --git a/eu_cookie_compliance.module b/eu_cookie_compliance.module
index 7663353..c17683a 100755
--- a/eu_cookie_compliance.module
+++ b/eu_cookie_compliance.module
@@ -11,14 +11,30 @@
  * Implements hook_menu().
  */
 function eu_cookie_compliance_menu() {
+  $default_language = language_default('language');
+
   $items['admin/config/system/eu-cookie-compliance'] = array(
     'title' => 'EU Cookie Compliance',
     'description' => 'Make your website compliant with the EU Directive on Privacy and Electronic Communications.',
     'page callback' => 'drupal_get_form',
-    'page arguments' => array('eu_cookie_compliance_admin_form'),
+    'page arguments' => array('eu_cookie_compliance_admin_form', $default_language),
     'access arguments' => array('administer EU Cookie Compliance popup'),
     'file' => 'eu_cookie_compliance.admin.inc',
   );
+
+  foreach(language_list() as $key => $language) {
+    if (!empty($language->enabled)) {
+      $items['admin/config/system/eu-cookie-compliance/' . $language->language] = array(
+        'title' => $language->name,
+        'description' => 'Make your website compliant with the EU Directive on Privacy and Electronic Communications.',
+        'page callback' => 'drupal_get_form',
+        'page arguments' => array('eu_cookie_compliance_admin_form', $language->language),
+        'access arguments' => array('administer EU Cookie Compliance popup'),
+        'file' => 'eu_cookie_compliance.admin.inc',
+        'type' => MENU_LOCAL_TASK,
+      );
+    }
+  }
   return $items;
 }
 
@@ -27,10 +43,10 @@ function eu_cookie_compliance_menu() {
  */
 function eu_cookie_compliance_page_build(&$page) {
   $popup_settings = eu_cookie_compliance_get_settings();
- // Check Add/Remove domains
+  // Check Add/Remove domains
   $domain_allow = true;
   $domain_option = isset($popup_settings['domains_option']) ? $popup_settings['domains_option'] : 1;
-  if (isset($popup_settings['domains_list'])) {
+  if (!empty($popup_settings['domains_list'])) {
     global $base_url;
     $domains_list = str_replace(array("\r\n", "\r"), "\n", $popup_settings['domains_list']);
     $domains_list = explode("\n", $domains_list);
@@ -55,8 +71,8 @@ function eu_cookie_compliance_page_build(&$page) {
     if(module_exists('geoip')) {
       $country_code = geoip_country_code();
     } elseif(module_exists('smart_ip')) {
-       $smart_ip_session = smart_ip_session_get('smart_ip');
-       $country_code = isset($smart_ip_session['location']['country_code']) ? $smart_ip_session['location']['country_code'] : NULL;
+      $smart_ip_session = smart_ip_session_get('smart_ip');
+      $country_code = isset($smart_ip_session['location']['country_code']) ? $smart_ip_session['location']['country_code'] : NULL;
     }
     $geoip_match = false;
     if ( in_array($country_code, array(NULL, 'BE', 'BG', 'CZ', 'DK', 'DE', 'EE', 'GB', 'IE', 'EL', 'ES', 'FR', 'HR', 'IT', 'CY', 'LV', 'LT', 'LU', 'HU', 'MT', 'NL', 'NO', 'AT', 'PL', 'PT', 'RO', 'SI', 'SK', 'FI', 'SE', 'UK'))) {
@@ -95,7 +111,7 @@ function eu_cookie_compliance_page_build(&$page) {
       if ($popup_settings['popup_bg_hex'] != '' and $popup_settings['popup_text_hex'] != '') {
         $position = $popup_settings['popup_position'] ? 'top' : 'bottom';
         $data['css'] = '#sliding-popup.sliding-popup-' . $position . ' {background:#'. check_plain($popup_settings["popup_bg_hex"]) . ';}'
-             . '#sliding-popup .popup-content #popup-text h2, #sliding-popup .popup-content #popup-text p {color:#' . check_plain($popup_settings['popup_text_hex']) . ' !important;}';
+          . '#sliding-popup .popup-content #popup-text h2, #sliding-popup .popup-content #popup-text p {color:#' . check_plain($popup_settings['popup_text_hex']) . ' !important;}';
       }
       $popup_text_info = str_replace(array("\r", "\n"), '', $popup_settings['popup_info']['value']);
       $popup_text_agreed = str_replace(array("\r", "\n"), '', $popup_settings['popup_agreed']['value']);
@@ -120,7 +136,7 @@ function eu_cookie_compliance_page_build(&$page) {
         'cookie_lifetime' => variable_get('eu_cookie_compliance_cookie_lifetime', 100),
       );
       cache_set('eu_cookie_compliance_client_settings_' . $language->language, $data, 'cache', CACHE_TEMPORARY);
-     }
+    }
     drupal_add_css($data['css'], array('type' => 'inline'));
     drupal_add_js(array('eu_cookie_compliance' => $data['variables']), array('type' => 'setting', 'scope' => 'footer'));
     drupal_add_css(drupal_get_path('module', 'eu_cookie_compliance') . '/css/eu_cookie_compliance.css');
@@ -170,9 +186,13 @@ function eu_cookie_compliance_theme() {
  * @return type
  */
 
-function eu_cookie_compliance_get_settings($setting = 'all') {
+function eu_cookie_compliance_get_settings($ln = FALSE, $setting = 'all') {
   global $language;
-  $popup_settings = variable_get('eu_cookie_compliance_' . $language->language, array());
+  
+  if (empty($ln)) {
+    $ln = $language->language;
+  }
+  $popup_settings = variable_get('eu_cookie_compliance_' . $ln, array());
 
   if ($setting == 'all') {
     return $popup_settings;