diff --git a/src/gui/qt/gametable/myavatarlabel.cpp b/src/gui/qt/gametable/myavatarlabel.cpp
index 19f7ce44..41660356 100644
--- a/src/gui/qt/gametable/myavatarlabel.cpp
+++ b/src/gui/qt/gametable/myavatarlabel.cpp
@@ -52,37 +52,37 @@ void MyAvatarLabel::contextMenuEvent ( QContextMenuEvent *event ) {
         //only active players are allowed to start a vote
         if((*it)->getMyActiveStatus()) {
 
-//           if(myW->getGuestMode()) {
-                //excpetions for client is logged in as guest
+            //           if(myW->getGuestMode()) {
+            //excpetions for client is logged in as guest
 
-                //TODO diese RIESENSAUEREI aufräumen!!!
+            //TODO diese RIESENSAUEREI aufräumen!!!
 
-//                Game *currentGame = myW->getSession()->getCurrentGame();
-//                PlayerListConstIterator it_c;
-//                int activePlayerCounter=0;
+            //                Game *currentGame = myW->getSession()->getCurrentGame();
+            //                PlayerListConstIterator it_c;
+            //                int activePlayerCounter=0;
 
-//                setVoteOnKickContextMenuEnabled(FALSE);
-//                action_IgnorePlayer->setEnabled(FALSE);
+            //                setVoteOnKickContextMenuEnabled(FALSE);
+            //                action_IgnorePlayer->setEnabled(FALSE);
 
-//                if(myW->getSession()->getGameType() == Session::GAME_TYPE_INTERNET) {
-//                    action_ReportBadAvatar->setVisible(TRUE);
-//                }
-//                else {
-//                    action_ReportBadAvatar->setVisible(FALSE);
-//                }
+            //                if(myW->getSession()->getGameType() == Session::GAME_TYPE_INTERNET) {
+            //                    action_ReportBadAvatar->setVisible(TRUE);
+            //                }
+            //                else {
+            //                    action_ReportBadAvatar->setVisible(FALSE);
+            //                }
 
-//                int i=0;
-//                for (it_c=currentGame->getSeatsList()->begin(); it_c!=currentGame->getSeatsList()->end(); it_c++) {
+            //                int i=0;
+            //                for (it_c=currentGame->getSeatsList()->begin(); it_c!=currentGame->getSeatsList()->end(); it_c++) {
 
-//                    //also inactive player which stays on table can be voted to kick
-//                    if(myContextMenuEnabled && myId != 0 && myId == i && (*it_c)->getMyType() != PLAYER_TYPE_COMPUTER && ( (*it_c)->getMyActiveStatus() || (*it_c)->getMyStayOnTableStatus() ) && !(QString::fromUtf8((*it_c)->getMyAvatar().c_str()).isEmpty()) )
-//                        showContextMenu(event->globalPos());
+            //                    //also inactive player which stays on table can be voted to kick
+            //                    if(myContextMenuEnabled && myId != 0 && myId == i && (*it_c)->getMyType() != PLAYER_TYPE_COMPUTER && ( (*it_c)->getMyActiveStatus() || (*it_c)->getMyStayOnTableStatus() ) && !(QString::fromUtf8((*it_c)->getMyAvatar().c_str()).isEmpty()) )
+            //                        showContextMenu(event->globalPos());
 
-//                    i++;
-//                }
-//            }
-//            else {
-                //normal player mode in internet game
+            //                    i++;
+            //                }
+            //            }
+            //            else {
+            //normal player mode in internet game
 
             Game *currentGame = myW->getSession()->getCurrentGame();
             PlayerListConstIterator it_c;
@@ -105,19 +105,22 @@ void MyAvatarLabel::contextMenuEvent ( QContextMenuEvent *event ) {
             int j=0;
             for (it_c=currentGame->getSeatsList()->begin(); it_c!=currentGame->getSeatsList()->end(); it_c++) {
 
-                if(myId == j && myW->getSession()->getClientPlayerInfo((*it_c)->getMyUniqueID()).isGuest) {
-                    action_IgnorePlayer->setDisabled(true);
+                if(myId == j) {
+
+                    if(myW->getSession()->getClientPlayerInfo((*it_c)->getMyUniqueID()).isGuest) {
+                        action_IgnorePlayer->setDisabled(true);
+                    }
+
+                    if(myW->getSession()->getGameType() == Session::GAME_TYPE_INTERNET && !((*it_c)->getMyAvatar().empty()) ) {
+                        action_ReportBadAvatar->setVisible(TRUE);
+                    }
+                    else {
+                        action_ReportBadAvatar->setVisible(FALSE);
+                    }
                 }
                 j++;
             }
 
-            if(myW->getSession()->getGameType() == Session::GAME_TYPE_INTERNET && !(QString::fromUtf8((*it_c)->getMyAvatar().c_str()).isEmpty()) ) {
-                action_ReportBadAvatar->setVisible(TRUE);
-            }
-            else {
-                action_ReportBadAvatar->setVisible(FALSE);
-            }
-
             int i=0;
             for (it_c=currentGame->getSeatsList()->begin(); it_c!=currentGame->getSeatsList()->end(); it_c++) {
 
@@ -127,8 +130,6 @@ void MyAvatarLabel::contextMenuEvent ( QContextMenuEvent *event ) {
 
                 i++;
             }
-
-
         }
     }
 }
@@ -251,7 +252,7 @@ void MyAvatarLabel::reportBadAvatar() {
                                                 QMessageBox::Yes | QMessageBox::No);
                 if(ret) {
                     QFileInfo fi(avatar);
-                                        myW->getSession()->reportBadAvatar((*it_c)->getMyUniqueID(), fi.baseName().toStdString());
+                    myW->getSession()->reportBadAvatar((*it_c)->getMyUniqueID(), fi.baseName().toStdString());
                 }
             }
             break;