diff --git a/andrea/macro-comments.ftl b/andrea/macro-comments.ftl
index 9808efd..568b721 100644
--- a/andrea/macro-comments.ftl
+++ b/andrea/macro-comments.ftl
@@ -144,7 +144,7 @@
 
         var commentHTML = '<div id="' + result.oId
             + '" class="comment-body ' + oddEven + '"><div class="comment-panel"><div class="left comment-author">'
-            + '<img alt="' + $("#commentName" + state).val() + '" src="' + result.commentThumbnailURL
+            + '<img alt="' + result.userName + '" src="' + result.commentThumbnailURL
             + '"/></div><div class="left comment-info">' + result.replyNameHTML;
 
         if (state !== "") {
diff --git a/classic/macro-comments.ftl b/classic/macro-comments.ftl
index c4555b5..45484c1 100644
--- a/classic/macro-comments.ftl
+++ b/classic/macro-comments.ftl
@@ -159,7 +159,7 @@
         commentHTML += '<div class="right">' + result.commentDate
             + '&nbsp;<a class="no-underline" href="javascript:replyTo(\'' + result.oId + '\');">${replyLabel}</a>'
             + '</div><div class="clear"></div></div><div class="comment-body">'
-            + '<div class="left comment-picture"><img alt="' + $("#commentName" + state).val()
+            + '<div class="left comment-picture"><img alt="' + result.userName
             + '" src="' + result.commentThumbnailURL + '"/>'
             + '</div><div class="comment-content">' + 
             Util.replaceEmString($("#comment" + state).val().replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\n/g,"<br/>"))
diff --git a/community/macro-comments.ftl b/community/macro-comments.ftl
index 360def9..f4a421f 100644
--- a/community/macro-comments.ftl
+++ b/community/macro-comments.ftl
@@ -155,7 +155,7 @@
 
     var addComment = function (result, state) {
         var commentHTML = '<div id="' + result.oId + '">'
-            + '<img class="left" alt="' + $("#commentName" + state).val() + '" src="' + result.commentThumbnailURL
+            + '<img class="left" alt="' + result.userName + '" src="' + result.commentThumbnailURL
             + '"/><div class="comment-panel left"><div class="comment-top">' + result.replyNameHTML;
 
         if (state !== "") {
diff --git a/ease/css/ease.min.css b/ease/css/ease.min.css
index ba1b26f..2d5fee9 100644
--- a/ease/css/ease.min.css
+++ b/ease/css/ease.min.css
@@ -1,3 +1,18 @@
+/**
+ * Copyright (c) 2009, 2010, 2011, 2012, 2013, B3log Team
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 html,body,div,ul,li{margin:0;padding:0}
 body{font-family:Verdana,arial,'\5fae\8f6f\96c5\9ed1';font-size:12px;background-color:#fcfcfc}
 ::selection{background-color:#d5d5d5;color:#fcfcfc}
diff --git a/ease/js/ease.min.js b/ease/js/ease.min.js
index f66545c..3d10e04 100644
--- a/ease/js/ease.min.js
+++ b/ease/js/ease.min.js
@@ -1 +1,16 @@
+/*
+ * Copyright (c) 2009, 2010, 2011, 2012, 2013, B3log Team
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 var goTranslate=function(){window.open("http://translate.google.com/translate?sl=auto&tl=auto&u="+location.href)};var getNextPage=function(){var $more=$(".article-next");currentPage+=1;var path="/articles/";if($("#tag").length===1){var pathnames=location.pathname.split("/");path="/articles/tags/"+pathnames[pathnames.length-1]+"/"}else if($("#archive").length===1){var pathnames=location.pathname.split("/");path="/articles/archives/"+pathnames[pathnames.length-2]+"/"+pathnames[pathnames.length-1]+"/"}else if($("#author").length===1){var pathnames=location.pathname.split("/");path="/articles/authors/"+pathnames[pathnames.length-1]+"/"}$.ajax({url:latkeConfig.servePath+path+currentPage,type:"GET",beforeSend:function(){$more.css("background","url("+latkeConfig.staticServePath+"/skins/ease/images/ajax-loader.gif) no-repeat scroll center center #fefefe")},success:function(result,textStatus){if(!result.sc){return}var articlesHTML="",pagination=result.rslts.pagination;for(var i=0;i<result.rslts.articles.length;i++){var article=result.rslts.articles[i],lastClass="";if(result.rslts.articles.length-1===i){lastClass=" article-last"}articlesHTML+='<li class="article'+lastClass+'">'+'<div class="article-title">'+"<h2>"+'<a rel="bookmark" class="ft-gray" href="'+latkeConfig.servePath+article.articlePermalink+'">'+article.articleTitle+"</a>";if(article.hasUpdated){articlesHTML+="<sup>"+Label.updatedLabel+"</sup>"}if(article.articlePutTop){articlesHTML+="<sup>"+Label.topArticleLabel+"</sup>"}articlesHTML+="</h2>"+'<div class="right">'+'<a rel="nofollow" class="ft-gray" href="'+latkeConfig.servePath+article.articlePermalink+'#comments">'+ +article.articleCommentCount+"&nbsp;&nbsp;"+Label.commentLabel+"</a>&nbsp;&nbsp;"+'<a rel="nofollow" class="ft-gray" href="'+latkeConfig.servePath+article.articlePermalink+'">'+article.articleViewCount+"&nbsp;&nbsp;"+Label.viewLabel+"</a>"+"</div>"+'<div class="clear"></div>'+"</div>"+'<div class="article-body">'+'<div id="abstract'+article.oId+'">'+article.articleAbstract+"</div>"+'<div id="content'+article.oId+'" class="none"></div>'+"</div>"+'<div class="right ft-gray">';if(article.hasUpdated){articlesHTML+=Util.toDate(article.articleUpdateTime,"yy-MM-dd HH:mm")}else{articlesHTML+=Util.toDate(article.articleCreateTime,"yy-MM-dd HH:mm")}articlesHTML+=' <a href="'+latkeConfig.servePath+"/authors/"+article.authorId+'">'+article.authorName+"</a>"+"</div>"+'<div class="left ft-gray">'+Label.tag1Label+" ";var articleTags=article.articleTags.split(",");for(var j=0;j<articleTags.length;j++){articlesHTML+='<a rel="tag" href="'+latkeConfig.servePath+"/tags/"+encodeURIComponent(articleTags[j])+'">'+articleTags[j]+"</a>";if(j<articleTags.length-1){articlesHTML+=", "}}articlesHTML+="</div>"+'<div class="clear"></div>'+"</li>"}$(".article-last").removeClass("article-last");$(".main>.wrapper>ul").append(articlesHTML);if(pagination.paginationPageCount===currentPage){$more.remove()}else{$more.css("background","none")}}})};var ease={$header:$(".header"),headerH:103,$body:$(".main > .wrapper"),$nav:$(".nav"),getCurrentPage:function(){var $next=$(".article-next");if($next.length>0){window.currentPage=$next.data("page")}},setNavCurrent:function(){$(".nav ul a").each(function(){var $this=$(this);if($this.attr("href")===latkeConfig.servePath+location.pathname){$this.addClass("current")}else if(/\/[0-9]+$/.test(location.pathname)){$(".nav ul li")[0].className="current"}})},initCommon:function(){Util.init();Util.replaceSideEm($(".recent-comments-content"));Util.buildTags("tagsSide")},initArchives:function(){var $archives=$(".archives");if($archives.length<1){return}$(".footer").css("marginTop","30px");var years=[],$archiveList=$archives.find("span").each(function(){var year=$(this).data("year"),tag=true;for(var i=0;i<years.length;i++){if(year===years[i]){tag=false;break}}if(tag){years.push(year)}});var yearsHTML="";for(var j=0;j<years.length;j++){var monthsHTML="";for(var l=0;l<$archiveList.length;l++){var $month=$($archiveList[l]);if($month.data("year")===years[j]){monthsHTML+=$month.html()}}yearsHTML+="<div><h3 class='ft-gray'>"+years[j]+"</h3>"+monthsHTML+"</div>"}$archives.html(yearsHTML);var $items=$(".archives>div"),line=0,top=0,heights=[];for(var m=0;m<$items.length;m++){for(var n=0;n<3;n++){if(m>=$items.length){break}$items[m].style.left=n*310+"px";if(line>0){if($items[m-3].style.top!==""){top=parseInt($items[m-3].style.top)}$items[m].style.top=$($items[m-3]).height()+60+top+"px";heights[n]=parseInt($items[m].style.top)+$($items[m]).height()+60}else{heights[n]=$($items[m]).height()+60}if(n<2){m+=1}}line+=1}$archives.height(heights.sort()[heights.length-1])},scrollEvent:function(){var _it=this;$(window).scroll(function(){var y=$(window).scrollTop(),topH=0;if($("#top").css("display")==="block"){topH=$("#top").height()}if(y>=_it.headerH+topH){_it.$nav.css("position","fixed");_it.$body.css("marginTop","55px")}else{_it.$nav.css("position","inherit");_it.$body.css("marginTop","0")}if(y>_it.headerH){var bodyH=$(window).height();var top=y+bodyH-21;if($("body").height()-58<=y+bodyH){top=$(".footer").offset().top-21}$("#goTop").fadeIn("slow").css("top",top)}else{$("#goTop").hide()}})},setDynamic:function(){var $dynamic=$(".dynamic");if($(".dynamic").length<1){return}var $comments=$dynamic.find(".side-comments"),$tags=$dynamic.find(".side-tags"),$mostComment=$dynamic.find(".side-most-comment"),$mostView=$dynamic.find(".side-most-view");if($comments.height()>$tags.height()){$tags.height($comments.height())}else{$comments.height($tags.height())}if($mostComment.height()>$mostView.height()){$mostView.height($mostComment.height())}else{$mostComment.height($mostView.height())}$(".article-body").each(function(){this.innerHTML=Util.replaceEmString($(this).html())})},scrollToCmt:function(){if($(window.location.hash).length==1){$(window).scrollTop($(window.location.hash).offset().top-60)}}};!function(){ease.getCurrentPage();ease.initCommon();ease.scrollEvent();ease.setNavCurrent();ease.initArchives();ease.setDynamic()}();
\ No newline at end of file
diff --git a/ease/macro-comments.ftl b/ease/macro-comments.ftl
index 7ec3a6b..da73886 100644
--- a/ease/macro-comments.ftl
+++ b/ease/macro-comments.ftl
@@ -124,14 +124,18 @@
 
                        var addComment = function(result, state) {
                            var commentHTML = '<div id="' + result.oId + '"><img class="comment-header" \
-            title="' + $("#commentName" + state).val() + '" alt="' + $("#commentName" + state).val() +
-                                   '" src="' + result.commentThumbnailURL + '"/><div class="comment-panel"><div class="left">' + result.replyNameHTML;
+                                    title="' + result.userName + '" alt="' + result.userName +
+                                   '" src="' + result.commentThumbnailURL 
+                                   + '"/><div class="comment-panel"><div class="left">' + result.replyNameHTML;
 
                            if (state !== "") {
-                               var commentOriginalCommentName = $("#" + page.currentCommentId + " .comment-panel>.left a").first().text();
-                               commentHTML += '&nbsp;@&nbsp;<a href="${servePath}' + result.commentSharpURL.split("#")[0] + '#' + page.currentCommentId + '"'
+                               var commentOriginalCommentName = $("#" + page.currentCommentId 
+                                       + " .comment-panel>.left a").first().text();
+                               commentHTML += '&nbsp;@&nbsp;<a href="${servePath}' 
+                                       + result.commentSharpURL.split("#")[0] + '#' + page.currentCommentId + '"'
                                        + 'onmouseover="page.showComment(this, \'' + page.currentCommentId + '\', 20);"'
-                                       + 'onmouseout="page.hideComment(\'' + page.currentCommentId + '\')">' + commentOriginalCommentName + '</a>';
+                                       + 'onmouseout="page.hideComment(\'' + page.currentCommentId + '\')">' 
+                                       + commentOriginalCommentName + '</a>';
                            }
 
                            commentHTML += '</div><div class="right ft-gray">' + result.commentDate.substring(2, 16)
@@ -141,7 +145,7 @@
                                    + '</div></div><span class="clear"></span></div>';
 
                            return commentHTML;
-                       }
+                       };
 
                        var replyTo = function(id) {
                            var commentFormHTML = "<table class='form' id='replyForm'>";
diff --git a/favourite/macro-comments.ftl b/favourite/macro-comments.ftl
index 2de85cb..97b4933 100644
--- a/favourite/macro-comments.ftl
+++ b/favourite/macro-comments.ftl
@@ -135,7 +135,7 @@
     var addComment = function (result, state) {
         var commentHTML = '<div id="' + result.oId
             + '" class="comment-body"><div class="comment-panel"><div class="left comment-author">'
-            + '<div><img alt="' + $("#commentName" + state).val() +
+            + '<div><img alt="' + result.userName +
             '" src="' + result.commentThumbnailURL + '"/></div>' + result.replyNameHTML;
         
         commentHTML += '</div><div class="left comment-info"><div class="left">' + result.commentDate;
diff --git a/i-nove/macro-comments.ftl b/i-nove/macro-comments.ftl
index 145fdef..e2dce04 100644
--- a/i-nove/macro-comments.ftl
+++ b/i-nove/macro-comments.ftl
@@ -133,7 +133,7 @@
     var addComment = function (result, state) {
         var commentHTML = '<div id="' + result.oId
             + '" class="comment-body"><div class="comment-panel"><div class="left comment-author">'
-            + '<div><img alt="' + $("#commentName" + state).val() + '" src="' +
+            + '<div><img alt="' + result.userName + '" src="' +
             result.commentThumbnailURL + '"/></div>' + result.replyNameHTML;
 
         commentHTML += '</div><div class="left comment-info"><div class="left">' + result.commentDate;
diff --git a/metro-hot/macro-comments.ftl b/metro-hot/macro-comments.ftl
index 767bf77..5e02af9 100644
--- a/metro-hot/macro-comments.ftl
+++ b/metro-hot/macro-comments.ftl
@@ -143,7 +143,7 @@
                     var addComment = function(result, state) {
                         $("#comments").prev().html("<h3>${commentLabel}</h3>");
                         var commentHTML = '<div id="' + result.oId + '" class="fn-clear"><img ' +
-                                'title="' + $("#commentName" + state).val() + '" alt="' + $("#commentName" + state).val() +
+                                'alt="' + result.userName +
                                 '" src="' + result.commentThumbnailURL + '"/>' +
                                 '<div class="comment-main"><div class="fn-clear">' + result.replyNameHTML;
 
diff --git a/mobile/header.ftl b/mobile/header.ftl
index 9b6dba8..9f216bc 100644
--- a/mobile/header.ftl
+++ b/mobile/header.ftl
@@ -34,7 +34,7 @@
             </div>
 
             <ul id="head-pages">
-                <li><a href="${servePath}/admin-index.do#main"><img src="${staticServePath}/skins/${skinDirName}/images/icon-pool/Home.png" alt=""/>Admin</a></li>
+                <li id="admin" data-login="${isLoggedIn?string}"><a href="${servePath}/admin-index.do#main"><img src="${staticServePath}/skins/${skinDirName}/images/icon-pool/Home.png" alt=""/>Admin</a></li>
                 <#list pageNavigations as page>
                 <li><a href="${page.pagePermalink}" target="${page.pageOpenTarget}"><img src="${staticServePath}/skins/${skinDirName}/images/icon-pool/Apps.png" alt=""/>${page.pageTitle}</a></li>
                 </#list>           
diff --git a/mobile/macro-comments.ftl b/mobile/macro-comments.ftl
index e9441cf..314fd84 100644
--- a/mobile/macro-comments.ftl
+++ b/mobile/macro-comments.ftl
@@ -90,94 +90,97 @@
 <#macro comment_script oId>
 <script type="text/javascript" src="${staticServePath}/js/page${miniPostfix}.js?${staticResourceVersion}" charset="utf-8"></script>
 <script type="text/javascript">
-    Page.prototype.submitComment = function (commentId, state) {
-        if (!state) {
-            state = '';
-        }
-        var tips = this.tips,
-        type = "article";
-        if (tips.externalRelevantArticlesDisplayCount === undefined) {
-            type = "page";
-        }
-        
-        if (this.validateComment(state)) {
-            $("#submitCommentButton" + state).attr("disabled", "disabled");
-            $("#commentErrorTip" + state).html(this.tips.loadingLabel);
-            
-            var requestJSONObject = {
-                "oId": tips.oId,
-                "commentContent": $("#comment" + state).val().replace(/(^\s*)|(\s*$)/g, ""),
-                "commentEmail": $("#commentEmail" + state).val(),
-                "commentURL": Util.proessURL($("#commentURL" + state).val().replace(/(^\s*)|(\s*$)/g, "")),
-                "commentName": $("#commentName" + state).val().replace(/(^\s*)|(\s*$)/g, ""),
-                "captcha": $("#commentValidate" + state).val()
-            };
-
-            if (state === "Reply") {
-                requestJSONObject.commentOriginalCommentId = commentId;
+        Page.prototype.submitComment = function(commentId, state) {
+            if (!state) {
+                state = '';
+            }
+            var tips = this.tips,
+                    type = "article";
+            if (tips.externalRelevantArticlesDisplayCount === undefined) {
+                type = "page";
             }
-                
-            $wpt("#loading").fadeIn(400);
-                
-            $.ajax({
-                type: "POST",
-                url: "/add-" + type + "-comment.do",
-                contentType: "application/json",
-                data: JSON.stringify(requestJSONObject),
-                success: function(result){
-                    $("#submitCommentButton" + state).removeAttr("disabled");
 
-                    if (!result.sc) {
-                        $("#commentValidate" + state).val("").focus();
-                        $("#commentErrorTip" + state).html(result.msg);
-                        $("#captcha" + state).attr("src", "/captcha.do?code=" + Math.random());
-                        $wpt('#commentErrorTip' + state).show();
+            if (this.validateComment(state)) {
+                $("#submitCommentButton" + state).attr("disabled", "disabled");
+                $("#commentErrorTip" + state).show().html(this.tips.loadingLabel);
+                var requestJSONObject = {
+                    "oId": tips.oId,
+                    "commentContent": $("#comment" + state).val().replace(/(^\s*)|(\s*$)/g, "")
+                };
+
+                if (!$("#admin").data("login")) {
+                    requestJSONObject = {
+                        "oId": tips.oId,
+                        "commentContent": $("#comment" + state).val().replace(/(^\s*)|(\s*$)/g, ""),
+                        "commentEmail": $("#commentEmail" + state).val(),
+                        "commentURL": Util.proessURL($("#commentURL" + state).val().replace(/(^\s*)|(\s*$)/g, "")),
+                        "commentName": $("#commentName" + state).val().replace(/(^\s*)|(\s*$)/g, ""),
+                        "captcha": $("#commentValidate" + state).val()
+                    };
+                    Cookie.createCookie("commentName", requestJSONObject.commentName, 365);
+                    Cookie.createCookie("commentEmail", requestJSONObject.commentEmail, 365);
+                    Cookie.createCookie("commentURL", $("#commentURL" + state).val().replace(/(^\s*)|(\s*$)/g, ""), 365);
+                }
+                
+                if (state === "Reply") {
+                    requestJSONObject.commentOriginalCommentId = commentId;
+                }
+                $.ajax({
+                    type: "POST",
+                    url: latkeConfig.servePath + "/add-" + type + "-comment.do",
+                    cache: false,
+                    contentType: "application/json",
+                    data: JSON.stringify(requestJSONObject),
+                    success: function(result) {
+                        $("#submitCommentButton" + state).removeAttr("disabled");
+
+                        if (!result.sc) {
+                            $("#commentValidate" + state).val("").focus();
+                            $("#commentErrorTip" + state).html(result.msg);
+                            $("#captcha" + state).attr("src", "/captcha.do?code=" + Math.random());
+                            $wpt('#commentErrorTip' + state).show();
+                            $wpt("#loading").fadeOut(400);
+                            return;
+                        }
+
+                        $wpt("#commentForm").hide();
                         $wpt("#loading").fadeOut(400);
-                        return;
-                    }
-                        
-                    $wpt("#commentForm").hide();
-                    $wpt("#loading").fadeOut(400);
-                    $wpt("#refresher").fadeIn(400);
-                    $("#comment" + state).val("");
-                    $("#commentValidate" + state).val("");
-                    $("#replyForm").remove();
-                        
-                }, // end success 
-                error:  function() {
-                       
-                } //end error
-            });
+                        $wpt("#refresher").fadeIn(400);
+                        $("#comment" + state).val("");
+                        $("#commentValidate" + state).val("");
+                        $("#replyForm").remove();
 
-            Cookie.createCookie("commentName", requestJSONObject.commentName, 365);
-            Cookie.createCookie("commentEmail", requestJSONObject.commentEmail, 365);
-            Cookie.createCookie("commentURL", $("#commentURL" + state).val().replace(/(^\s*)|(\s*$)/g, ""), 365);
-        }
-    };
-    
-    var replyTo = function (id) {
-        var commentFormHTML = "<div id='replyForm'>";
-        page.addReplyForm(id, commentFormHTML, "</div>");
-    };
-    
-    var page = new Page({
-        "nameTooLongLabel": "${nameTooLongLabel}",
-        "mailCannotEmptyLabel": "${mailCannotEmptyLabel}",
-        "mailInvalidLabel": "${mailInvalidLabel}",
-        "commentContentCannotEmptyLabel": "${commentContentCannotEmptyLabel}",
-        "captchaCannotEmptyLabel": "${captchaCannotEmptyLabel}",
-        "loadingLabel": "${loadingLabel}",
-        "oId": "${oId}",
-        "skinDirName": "${skinDirName}",
-        "blogHost": "${blogHost}",
-        "randomArticles1Label": "${randomArticles1Label}",
-        "externalRelevantArticles1Label": "${externalRelevantArticles1Label}"
-    });
+                    }, // end success 
+                    error: function() {
+                    } //end error
+                });
+            }
 
-    (function () {
-        page.load();
-        // emotions
-        page.replaceCommentsEm("#commentlist .combody");
+        };
+
+        var replyTo = function(id) {
+            var commentFormHTML = "<div id='replyForm'>";
+            page.addReplyForm(id, commentFormHTML, "</div>");
+        };
+
+        var page = new Page({
+            "nameTooLongLabel": "${nameTooLongLabel}",
+            "mailCannotEmptyLabel": "${mailCannotEmptyLabel}",
+            "mailInvalidLabel": "${mailInvalidLabel}",
+            "commentContentCannotEmptyLabel": "${commentContentCannotEmptyLabel}",
+            "captchaCannotEmptyLabel": "${captchaCannotEmptyLabel}",
+            "loadingLabel": "${loadingLabel}",
+            "oId": "${oId}",
+            "skinDirName": "${skinDirName}",
+            "blogHost": "${blogHost}",
+            "randomArticles1Label": "${randomArticles1Label}",
+            "externalRelevantArticles1Label": "${externalRelevantArticles1Label}"
+        });
+
+        (function() {
+            page.load();
+            // emotions
+            page.replaceCommentsEm("#commentlist .combody");
             <#nested>
         })();
 </script>
diff --git a/neoease/macro-comments.ftl b/neoease/macro-comments.ftl
index 507196c..b894185 100644
--- a/neoease/macro-comments.ftl
+++ b/neoease/macro-comments.ftl
@@ -132,7 +132,7 @@
             oddEven = "comment-even";
         }
         var commentHTML = '<div id="' + result.oId + '" class="oddEven"><img class="comment-header" \
-            title="' + $("#commentName" + state).val() + '" alt="' + $("#commentName" + state).val() + 
+            alt="' + result.userName + 
             '" src="' + result.commentThumbnailURL + '"/><div class="comment-panel"><div class="left">' + result.replyNameHTML;
 
         if (state !== "") {
diff --git a/owmx-3.0/macro-comments.ftl b/owmx-3.0/macro-comments.ftl
index b4791e9..82e44a6 100644
--- a/owmx-3.0/macro-comments.ftl
+++ b/owmx-3.0/macro-comments.ftl
@@ -136,7 +136,7 @@
     var addComment = function (result, state) {
         var commentHTML = '<div id="' + result.oId
             + '" class="comment-body"><div class="comment-panel"><div class="left comment-author">'
-            + '<div><img alt="' + $("#commentName" + state).val() + 
+            + '<div><img alt="' + result.userName + 
             '" src="' + result.commentThumbnailURL + '"/></div>' + result.replyNameHTML;
 
         commentHTML += '</div><div class="left comment-info"><div class="left">' + result.commentDate;
diff --git a/timeline/macro-comments.ftl b/timeline/macro-comments.ftl
index 4a63513..d2a2710 100644
--- a/timeline/macro-comments.ftl
+++ b/timeline/macro-comments.ftl
@@ -118,7 +118,7 @@
 
                        var addComment = function(result, state) {
                            var commentHTML = '<li id="' + result.oId + '"><img \
-            title="' + $("#commentName" + state).val() + '" alt="' + $("#commentName" + state).val() +
+                                    alt="' + result.userName +
                                    '" src="' + result.commentThumbnailURL + '"/><div><span class="author">' + result.replyNameHTML;
 
                            if (state !== "") {
diff --git a/tree-house/macro-comments.ftl b/tree-house/macro-comments.ftl
index 9c9c684..cc459fd 100644
--- a/tree-house/macro-comments.ftl
+++ b/tree-house/macro-comments.ftl
@@ -159,7 +159,7 @@
 
         commentHTML += '<div class="right">' + result.commentDate
             + '&nbsp;<a rel="nofollow" class="no-underline" href="javascript:replyTo(\'' + result.oId + '\');">${replyLabel}</a>'
-            + '</div><div class="clear"></div></div><div><img alt="' + $("#commentName" + state).val()
+            + '</div><div class="clear"></div></div><div><img alt="' + result.userName
             + '" src="' + result.commentThumbnailURL + '" class="comment-picture left"/>'
             + '<div class="comment-content">'
             + Util.replaceEmString($("#comment" + state).val().replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\n/g,"<br/>"))