diff --git a/config/env/torrents.js b/config/env/torrents.js
index a12efe4d..f26c7140 100644
--- a/config/env/torrents.js
+++ b/config/env/torrents.js
@@ -3,8 +3,8 @@
 module.exports = {
   meanTorrentConfig: {
     language: [
-      {name: 'en', css: '.flag-icon-gb'},
-      {name: 'zh', css: '.flag-icon-cn'}
+      {name: 'en', index: 0, class: 'flag-icon-gb', title: 'English'},
+      {name: 'zh', index: 1, class: 'flag-icon-cn', title: '中文'}
     ],
     announce: {
       url: 'http://127.0.0.1:3000/announce',
diff --git a/modules/core/client/controllers/header.client.controller.js b/modules/core/client/controllers/header.client.controller.js
index a1fadfad..b1c9c56d 100644
--- a/modules/core/client/controllers/header.client.controller.js
+++ b/modules/core/client/controllers/header.client.controller.js
@@ -5,10 +5,11 @@
     .module('core')
     .controller('HeaderController', HeaderController);
 
-  HeaderController.$inject = ['$scope', '$state', 'Authentication', 'menuService'];
+  HeaderController.$inject = ['$scope', '$state', '$translate', 'Authentication', 'menuService', 'MeanTorrentConfig', 'localStorageService'];
 
-  function HeaderController($scope, $state, Authentication, menuService) {
+  function HeaderController($scope, $state, $translate, Authentication, menuService, MeanTorrentConfig, localStorageService) {
     var vm = this;
+    vm.language = MeanTorrentConfig.meanTorrentConfig.language;
 
     vm.accountMenu = menuService.getMenu('account').items[0];
     vm.authentication = Authentication;
@@ -21,5 +22,13 @@
       // Collapsing the menu after navigation
       vm.isCollapsed = false;
     }
+
+    vm.changeLanguage = function (langKey) {
+      console.log('langKey=' + langKey);
+      localStorageService.set('storage_user_lang', langKey);
+      $translate.use(langKey);
+
+      $state.reload();
+    };
   }
 }());
diff --git a/modules/core/client/controllers/home.client.controller.js b/modules/core/client/controllers/home.client.controller.js
index d96156da..42ff075d 100644
--- a/modules/core/client/controllers/home.client.controller.js
+++ b/modules/core/client/controllers/home.client.controller.js
@@ -13,7 +13,6 @@
     vm.movieTopList = undefined;
 
     vm.info_is_ready = false;
-    //$translate.use('en');
 
     vm.COMING = 'coming soon...';
 
diff --git a/modules/core/client/less/mt.less b/modules/core/client/less/mt.less
index 5bf5a83e..bf31c397 100644
--- a/modules/core/client/less/mt.less
+++ b/modules/core/client/less/mt.less
@@ -507,4 +507,27 @@
         margin-bottom: 15px;
         margin-top: 5px;
     }
+}
+
+.lang-list {
+    margin-left: 10px;
+    line-height: 2;
+    .flag-icon {
+        font-size: 18px;
+        margin-left: 10px;
+        &,
+        &:hover,
+        &:focus {
+            cursor: pointer;
+        }
+    }
+}
+
+.lang-footer {
+    margin-left: 0;
+    .flag-icon {
+        font-size: 15px;
+        margin-left: 0px;
+        margin-right: 10px;
+    }
 }
\ No newline at end of file
diff --git a/modules/core/client/views/footer.client.view.html b/modules/core/client/views/footer.client.view.html
index d8f6c730..cba22ba7 100644
--- a/modules/core/client/views/footer.client.view.html
+++ b/modules/core/client/views/footer.client.view.html
@@ -1,8 +1,13 @@
-<div class="container-fluid" style="padding-top: 30px; padding-bottom: 30px;">
+<div class="container-fluid" style="padding-top: 30px; padding-bottom: 30px;" ng-controller="HeaderController as vm">
     <div class="container">
         <div class="row view-footer">
             <div class="col-sm-7 col-sm-offset-1">
                 <ul>
+                    <li>
+                        <span class="lang-list lang-footer">
+                            <span class="flag-icon {{l.class}}" title="{{l.title}}" ng-click="vm.changeLanguage(l.name);" ng-repeat="l in vm.language | orderBy: '-index'"></span>
+                        </span>
+                    </li>
                     <li translate="GIT_REPO"></li>
                     <li translate="MIT_PROTOCOL"></li>
                 </ul>
diff --git a/modules/core/client/views/header.client.view.html b/modules/core/client/views/header.client.view.html
index f6bce980..00883a18 100644
--- a/modules/core/client/views/header.client.view.html
+++ b/modules/core/client/views/header.client.view.html
@@ -36,6 +36,12 @@
           <span ng-bind="vm.authentication.user.displayName"></span> <b class="caret"></b>
         </a>
         <ul class="dropdown-menu" role="menu">
+          <li>
+            <span class="lang-list">
+              <span class="flag-icon {{l.class}}" title="{{l.title}}" ng-click="vm.changeLanguage(l.name);" ng-repeat="l in vm.language | orderBy: '-index'"></span>
+            </span>
+          </li>
+          <li class="divider"></li>
           <li ui-sref-active="active" ng-repeat="item in vm.accountMenu.items">
             <a ui-sref="{{item.state}}" ng-bind="item.title" menu-title="{{item.title}}"></a>
           </li>
diff --git a/modules/vip/client/controllers/vip.client.controller.js b/modules/vip/client/controllers/vip.client.controller.js
index 45a0293c..792d3d85 100644
--- a/modules/vip/client/controllers/vip.client.controller.js
+++ b/modules/vip/client/controllers/vip.client.controller.js
@@ -5,21 +5,13 @@
     .module('vip')
     .controller('VipController', VipController);
 
-  VipController.$inject = ['$scope', '$translate', 'localStorageService'];
+  VipController.$inject = ['$scope', '$translate'];
 
-  function VipController($scope, $translate, localStorageService) {
+  function VipController($scope, $translate) {
     var vm = this;
 
     vm.init = function () {
-      var o = localStorageService.get('storage_user_lang');
 
-      if (o === 'en') {
-        localStorageService.set('storage_user_lang', 'zh');
-        $translate.use('zh');
-      } else {
-        localStorageService.set('storage_user_lang', 'en');
-        $translate.use('en');
-      }
     };
   }
 }());