diff --git a/retroshare-gui/src/gui/feeds/SecurityItem.cpp b/retroshare-gui/src/gui/feeds/SecurityItem.cpp
index b2bbc2cf3..68419ee94 100644
--- a/retroshare-gui/src/gui/feeds/SecurityItem.cpp
+++ b/retroshare-gui/src/gui/feeds/SecurityItem.cpp
@@ -138,6 +138,7 @@ void SecurityItem::updateItemStatic()
 				title = tr("Missing/Damaged certificate. Not a real Retroshare user.");
 			requestLabel->hide();
 			}
+			avatar->setDefaultAvatar(":icons/ssl.png");
 			break;
 		case RS_FEED_ITEM_SEC_INTERNAL_ERROR:
 			title = tr("Certificate caused an internal error.");
@@ -186,7 +187,7 @@ void SecurityItem::updateItem()
 				 */
 
 			/* set peer name */
-			peerNameLabel->setText(tr("A unknown peer"));
+			//peerNameLabel->setText(tr("A unknown peer"));
 
 			nameLabel->setText(tr("Unknown") + " (" + tr("Profile ID: ") + QString::fromStdString(mGpgId.toStdString()) + ")");
 			idLabel->setText(QString::fromStdString(mSslId.toStdString()));
@@ -205,15 +206,25 @@ void SecurityItem::updateItem()
 			connLeftLabel->hide();
 
 			chatButton->hide();
-			//quickmsgButton->hide();
-			requestLabel->hide();
 
 			removeFriendButton->setEnabled(false);
 			removeFriendButton->hide();
 			peerDetailsButton->setEnabled(false);
-
-			friendRequesttoolButton->show();
-			requestLabel->show();
+			
+			if(mType == RS_FEED_ITEM_SEC_BAD_CERTIFICATE)
+			{
+				peerNameLabel->setText(tr("SSL request"));
+				friendRequesttoolButton->hide();
+				requestLabel->hide();
+				peerDetailsButton->hide;
+			}
+			else 
+			{
+				peerNameLabel->setText(tr("A unknown peer"));
+				friendRequesttoolButton->show();
+				requestLabel->show();
+				peerDetailsButton->show();
+			}
 
 			return;
 		}
diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc
index c9a4f33c8..995157b69 100644
--- a/retroshare-gui/src/gui/icons.qrc
+++ b/retroshare-gui/src/gui/icons.qrc
@@ -63,6 +63,7 @@
         <file>icons/logo_2_connected_128.png</file>
         <file>icons/outlook.png</file>
         <file>icons/question.png</file>
+        <file>icons/ssl.png</file>
         <file>icons/plugins_128.png</file>
         <file>icons/png/add.png</file>
         <file>icons/png/add-identity.png</file>
diff --git a/retroshare-gui/src/gui/icons/ssl.png b/retroshare-gui/src/gui/icons/ssl.png
new file mode 100644
index 000000000..ca1686616
Binary files /dev/null and b/retroshare-gui/src/gui/icons/ssl.png differ