diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php
index fb0f8772d..0a022bd63 100644
--- a/modules/admin/admin.admin.view.php
+++ b/modules/admin/admin.admin.view.php
@@ -99,7 +99,7 @@
 					}
 				}
 			}
-			
+
 			// Admin logo, title setup
 			$configObject = $oModuleModel->getModuleConfig('admin');
 			$gnbTitleInfo->adminTitle = $configObject->adminTitle?$configObject->adminTitle:'XE Admin';
@@ -192,12 +192,12 @@
 			$status->comment->todayCount = $oCommentModel->getCommentCountByDate($today);
 			$status->comment->totalCount = $oCommentModel->getCommentCountByDate();
 
-            // Trackback Status 
+            // Trackback Status
 			$oTrackbackAdminModel = &getAdminModel('trackback');
 			$status->trackback->todayCount = $oTrackbackAdminModel->getTrackbackCountByDate($today);
 			$status->trackback->totalCount = $oTrackbackAdminModel->getTrackbackCountByDate();
 
-            // Attached files Status 
+            // Attached files Status
 			$oFileAdminModel = &getAdminModel('file');
 			$status->file->todayCount = $oFileAdminModel->getFilesCountByDate($today);
 			$status->file->totalCount = $oFileAdminModel->getFilesCountByDate();
@@ -280,6 +280,21 @@
             Context::set('module_list', $module_list);
             Context::set('isUpdated', $isUpdated);
 
+			// favorite
+			$oAdminModel = &getAdminModel('admin');
+			$output = $oAdminModel->getFavoriteList(0);
+			$favorite_list = $output->get('favoriteList');
+			if ($favorite_list)
+			{
+				foreach($favorite_list as $no => $favorite)
+				{
+					$module_info = $oModuleModel->getModuleInfoXml($favorite->module);
+					$favorite_list[$no] = $module_info;
+					$favorite_list[$no]->module = $favorite->module;
+				}
+			}
+			Context::set('favorite_list', $favorite_list);
+
 			// gathering enviroment check
 			$path = FileHandler::getRealPath('./files/env/'.__ZBXE_VERSION__);
 			$isEnviromentGatheringAgreement = false;
@@ -294,29 +309,29 @@
          * @return none
          **/
         function dispAdminConfig() {
-            $db_info = Context::getDBInfo();            
-			
+            $db_info = Context::getDBInfo();
+
 			Context::set('sftp_support', function_exists(ssh2_sftp));
 
             Context::set('selected_lang', $db_info->lang_type);
-			
+
 			Context::set('default_url', $db_info->default_url);
-	
+
             Context::set('langs', Context::loadLangSupported());
 
-            Context::set('lang_selected', Context::loadLangSelected());	
-			
+            Context::set('lang_selected', Context::loadLangSelected());
+
             Context::set('admin_ip', $db_info->admin_ip);
-		
-			
+
+
 			$favicon_url = $this->iconUrlCheck('favicon.ico','faviconSample.png');
 			$mobicon_url = $this->iconUrlCheck('mobicon.png','mobiconSample.png');
             Context::set('favicon_url', $favicon_url);
-			Context::set('mobicon_url', $mobicon_url);			
-			
+			Context::set('mobicon_url', $mobicon_url);
+
             $ftp_info = Context::getFTPInfo();
             Context::set('ftp_info', $ftp_info);
-			
+
 			$oDocumentModel = &getModel('document');
             $config = $oDocumentModel->getDocumentConfig();
             Context::set('thumbnail_type',$config->thumbnail_type);
diff --git a/modules/admin/tpl/index.html b/modules/admin/tpl/index.html
index 3bc451a95..5552194da 100644
--- a/modules/admin/tpl/index.html
+++ b/modules/admin/tpl/index.html
@@ -45,7 +45,7 @@
 				<!--@foreach($latestDocumentList AS $key=>$value)-->
 				{@$document = $value->variables}
 				<li>
-					<a href="{getUrl('', 'document_srl', $document['document_srl'])}" target="_blank">{$document['title']}</a> <span class="side">{$document['nick_name']}</span> 
+					<a href="{getUrl('', 'document_srl', $document['document_srl'])}" target="_blank">{$document['title']}</a> <span class="side">{$document['nick_name']}</span>
 					<span class="action">
 						<form>
 						<input type="hidden" name="module" value="admin" />
@@ -65,7 +65,7 @@
 			<ul class="lined">
 				<!--@foreach($latestCommentList AS $key=>$value)-->
 				<li>
-					<a href="#" target="_blank">{$value->content}</a> <span class="side">{$value->nick_name}</span> 
+					<a href="#" target="_blank">{$value->content}</a> <span class="side">{$value->nick_name}</span>
 					<span class="action">
 						<form>
 						<input type="hidden" name="module" value="admin" />
@@ -85,7 +85,7 @@
 			<ul class="lined">
 				<!--@foreach($latestTrackbackList AS $key=>$value)-->
 				<li>
-					<a href="{$value->url}" target="_blank">{$value->title}</a> <span class="side">{$value->blog_name}</span> 
+					<a href="{$value->url}" target="_blank">{$value->title}</a> <span class="side">{$value->blog_name}</span>
 					<span class="action">
 						<form>
 						<input type="hidden" name="module" value="admin" />
@@ -110,8 +110,19 @@
 		<div class="portlet">
 			<h2 class="h2">Your Favorite</h2>
 			<ul class="lined">
-				<LI><A HREF="#">EXTENSIONS</A> &GT; <A HREF="#">INSTALLED MODULE</A> &GT; <A HREF="#">BOARD</A></LI>
-				<LI><A HREF="#">EXTENSIONS</A> &GT; <A HREF="#">INSTALLED MODULE</A> &GT; <A HREF="#">WIKI</A></LI>
+				<li loop="$favorite_list => $favorite">
+					<a href="{getUrl('act', $favorite->admin_index_act)}">{$favorite->title}</a>
+					<span class="action">
+						<form>
+						<input type="hidden" name="module" value="admin" />
+						<input type="hidden" name="act" value="procAdminToggleFavorite" />
+						<input type="hidden" name="site_srl" value="0" />
+						<input type="hidden" name="module_name" value="{$favorite->module}" />
+						<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin')}" />
+						<button type="submit" class="text">{$lang->cmd_delete}</button>
+						</form>
+					</span>
+				</li>
 			</UL>
 		</div>
 	</div>