diff --git a/libretroshare/src/ft/ftserver.cc b/libretroshare/src/ft/ftserver.cc
index 9e5073efe..6acac9c24 100644
--- a/libretroshare/src/ft/ftserver.cc
+++ b/libretroshare/src/ft/ftserver.cc
@@ -717,7 +717,7 @@ bool ftServer::shareDownloadDirectory(bool share)
 		/* Share */
 		SharedDirInfo inf ;
 		inf.filename = mFtController->getDownloadDirectory();
-		inf.shareflags = RS_FILE_HINTS_NETWORK_WIDE | RS_FILE_HINTS_BROWSABLE ;
+		inf.shareflags = RS_FILE_HINTS_NETWORK_WIDE ;
 
 		return addSharedDirectory(inf);
 	}
diff --git a/retroshare-gui/src/gui/ShareDialog.cpp b/retroshare-gui/src/gui/ShareDialog.cpp
index 2e0c3323d..dc813c007 100644
--- a/retroshare-gui/src/gui/ShareDialog.cpp
+++ b/retroshare-gui/src/gui/ShareDialog.cpp
@@ -40,7 +40,9 @@ ShareDialog::ShareDialog(std::string filename, QWidget *parent, Qt::WFlags flags
 
     ui.okButton->setEnabled(false);
 
-    if (filename.empty() == false) {
+    if (filename.empty()) {
+        ui.networkwideCheckBox->setChecked(true);
+    } else {
         /* edit exisiting share */
         std::list<SharedDirInfo> dirs;
         rsFiles->getSharedDirectories(dirs);
diff --git a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
index 4320b3776..ba23760f8 100755
--- a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
+++ b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
@@ -1051,7 +1051,7 @@ void ConclusionPage::initializePage() {
     //set the radio button to sign the GPG key
     if (detail.accept_connection && !detail.ownsign) {
         //gpg key connection is already accepted, don't propose to accept it again
-        signGPGCheckBox->setChecked(true);
+        signGPGCheckBox->setChecked(false);
         acceptNoSignGPGCheckBox->hide();
         acceptNoSignGPGCheckBox->setChecked(false);
     }
@@ -1064,7 +1064,7 @@ void ConclusionPage::initializePage() {
     if (!detail.accept_connection && !detail.ownsign) {
         acceptNoSignGPGCheckBox->setChecked(true);
         signGPGCheckBox->show();
-        signGPGCheckBox->setChecked(true);
+        signGPGCheckBox->setChecked(false);
         acceptNoSignGPGCheckBox->show();
     }
     if (detail.accept_connection && detail.ownsign) {