diff --git a/web/add/favorite/index.php b/web/add/favorite/index.php
index 5cfe582d..e9f2e828 100644
--- a/web/add/favorite/index.php
+++ b/web/add/favorite/index.php
@@ -1,65 +1,23 @@
 <?
 
-echo 'adding favorite <br><br>';
-
-// Init
 error_reporting(NULL);
-ob_start();
 session_start();
 
 
-// mail_acc
-// firewall
-
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
-// Check POST request
-//if (!empty($_POST['ok'])) {
-
-    // Check token
+// Check token
 //    if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) {
 //        header('location: /login/');
 //        exit();
 //    }
 
-
-    // v-list-user-favourites
-    // v-delete-user-favourites admin web test0011.com
-
     // Protect input
-//    $v_section = escapeshellarg($_POST['v_section']);
-//    $v_unit_id = escapeshellarg($_POST['v_unit_id']);
-
     $v_section = escapeshellarg($_REQUEST['v_section']);
     $v_unit_id = escapeshellarg($_REQUEST['v_unit_id']);
 
-//    $v_section = 'web';
-//    $v_unit_id = 'test0011.com';
+    $_SESSION['favourites'][strtoupper($_REQUEST['v_section'])][$_REQUEST['v_unit_id']] = 1;
 
-
-    echo VESTA_CMD."v-add-user-favourites ".$_SESSION['user']." ".$v_section." ".$v_unit_id;
-
-    echo ' - ';
-
-    // Add cron job
     exec (VESTA_CMD."v-add-user-favourites ".$_SESSION['user']." ".$v_section." ".$v_unit_id, $output, $return_var);
-    check_return_code($return_var,$output);
-
-    var_dump($return_var);
-    echo '<br> -------------------- <br>';
-
-    var_dump($output);
-    echo '<br> -------------------- <br>';
-
-
-/*
-    echo '<br>favorites:<br>';
-
-    // Data
-    exec (VESTA_CMD."v-list-user-favourites $user json", $output, $return_var);
-    $data = json_decode(implode('', $output), true);
-    $data = array_reverse($data,true);
-    print_r($data);
-*/
-//}
+//    check_return_code($return_var,$output);
 ?>
\ No newline at end of file
diff --git a/web/delete/favorite/index.php b/web/delete/favorite/index.php
index 0b61b2c4..9f471b9b 100644
--- a/web/delete/favorite/index.php
+++ b/web/delete/favorite/index.php
@@ -1,19 +1,15 @@
 <?php
 
-    echo 'delete Favorites<br>';
-
-
     error_reporting(NULL);
-    ob_start();
     session_start();
 
     include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
+    unset($_SESSION['favourites'][strtoupper($_REQUEST['v_section'])][$_REQUEST['v_unit_id']]);
+
     $v_section = escapeshellarg($_REQUEST['v_section']);
     $v_unit_id = escapeshellarg($_REQUEST['v_unit_id']);
 
     exec (VESTA_CMD."v-delete-user-favourites ".$_SESSION['user']." ".$v_section." ".$v_unit_id, $output, $return_var);
-    check_return_code($return_var,$output);
-
-
+//    check_return_code($return_var,$output);
 ?>
\ No newline at end of file
diff --git a/web/inc/main.php b/web/inc/main.php
index 07113d3a..68fbe272 100644
--- a/web/inc/main.php
+++ b/web/inc/main.php
@@ -89,6 +89,9 @@ if (isset($_SESSION['language'])) {
         case 'es':
             setlocale(LC_ALL, 'es_ES.utf8');
             break;
+        case 'ja':
+            setlocale(LC_ALL, 'ja_JP.utf8');
+            break;
         default:
             setlocale(LC_ALL, 'en_US.utf8');
     }
@@ -102,11 +105,7 @@ if (isset($_SESSION['look']) && ( $_SESSION['look'] != 'admin' )) {
     $user = $_SESSION['look'];
 }
 
-if (isset($_SESSION['user'])) {
-    get_favorites();
-}
-
-function get_favorites(){
+function get_favourites(){
     exec (VESTA_CMD."v-list-user-favourites ".$_SESSION['user']." json", $output, $return_var);
 //    $data = json_decode(implode('', $output).'}', true);
     $data = json_decode(implode('', $output), true);
diff --git a/web/login/index.php b/web/login/index.php
index 1216e259..06617e2f 100644
--- a/web/login/index.php
+++ b/web/login/index.php
@@ -67,6 +67,9 @@ if (isset($_POST['user']) && isset($_POST['password'])) {
         $_SESSION['user'] = key($data);
         $v_user = $_SESSION['user'];
 
+        // Get user favorites
+        get_favourites();
+
         // Define language
         if (!empty($data[$v_user]['LANGUAGE'])) $_SESSION['language'] = $data[$v_user]['LANGUAGE'];