diff --git a/retroshare-gui/src/gui/HomePage.cpp b/retroshare-gui/src/gui/HomePage.cpp
index dec4e9fec..ff7622b4b 100644
--- a/retroshare-gui/src/gui/HomePage.cpp
+++ b/retroshare-gui/src/gui/HomePage.cpp
@@ -207,19 +207,22 @@ HomePage::~HomePage()
 
 RetroshareInviteFlags HomePage::currentInviteFlags() const
 {
-     RetroshareInviteFlags invite_flags = RetroshareInviteFlags::NOTHING;
+    RetroshareInviteFlags invite_flags = RetroshareInviteFlags::NOTHING;
 
-    if(mIncludeLocIPact->isChecked())
-        invite_flags |= RetroshareInviteFlags::CURRENT_LOCAL_IP;
+    if(!RsAccounts::isHiddenNode())
+    {
+        if(mIncludeLocIPact->isChecked())
+            invite_flags |= RetroshareInviteFlags::CURRENT_LOCAL_IP;
 
-    if(mIncludeExtIPact->isChecked())
-        invite_flags |= RetroshareInviteFlags::CURRENT_EXTERNAL_IP;
+        if(mIncludeExtIPact->isChecked())
+            invite_flags |= RetroshareInviteFlags::CURRENT_EXTERNAL_IP;
 
-    if(mIncludeDNSact->isChecked())
-        invite_flags |= RetroshareInviteFlags::DNS;
+        if(mIncludeDNSact->isChecked())
+            invite_flags |= RetroshareInviteFlags::DNS;
 
-    if(mIncludeIPHistoryact->isChecked())
-        invite_flags |= RetroshareInviteFlags::FULL_IP_HISTORY;
+        if(mIncludeIPHistoryact->isChecked())
+            invite_flags |= RetroshareInviteFlags::FULL_IP_HISTORY;
+    }
 
     return invite_flags;
 }
diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index de2ca8baf..0af20e824 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -485,11 +485,11 @@ void MainWindow::initStackedPage()
   addPage(newsFeed = new NewsFeed(ui->stackPages), grp, &notify);
 
   //List All notify before Setting was created
-  QList<QPair<MainPage*, QPair<QAction*, QListWidgetItem*> > >::iterator notifyIt;
-  for (notifyIt = notify.begin(); notifyIt != notify.end(); ++notifyIt) {
-      UserNotify *userNotify = notifyIt->first->getUserNotify();
+  for (auto notifyIt:notify)
+  {
+      UserNotify *userNotify = notifyIt.first->getUserNotify();
       if (userNotify) {
-          userNotify->initialize(ui->toolBarPage, notifyIt->second.first, notifyIt->second.second);
+          userNotify->initialize(ui->toolBarPage, notifyIt.second.first, notifyIt.second.second);
           connect(userNotify, SIGNAL(countChanged()), this, SLOT(updateTrayCombine()));
           userNotifyList.push_back(userNotify);
       }