diff --git a/libretroshare/src/pqi/pqi_base.h b/libretroshare/src/pqi/pqi_base.h
index 2e9364b75..93af4b5cc 100644
--- a/libretroshare/src/pqi/pqi_base.h
+++ b/libretroshare/src/pqi/pqi_base.h
@@ -42,7 +42,7 @@
 
 
 #define PQI_MIN_PORT 1024
-#define PQI_MAX_PORT 50000
+#define PQI_MAX_PORT 65535
 #define PQI_DEFAULT_PORT 7812
 
 int getPQIsearchId();
diff --git a/retroshare-gui/src/gui/settings/ServerPage.ui b/retroshare-gui/src/gui/settings/ServerPage.ui
index 6fa5fd0ce..5b9950c8f 100755
--- a/retroshare-gui/src/gui/settings/ServerPage.ui
+++ b/retroshare-gui/src/gui/settings/ServerPage.ui
@@ -732,8 +732,11 @@ peers still need to trust each other to allow connection. </string>
            </item>
            <item row="0" column="2">
             <widget class="QSpinBox" name="localPort">
+             <property name="toolTip">
+              <string>Acceptable ports range from 1024 to 65535. Ports below 1024 are reserved by your system.</string>
+             </property>
              <property name="minimum">
-              <number>0</number>
+              <number>1024</number>
              </property>
              <property name="maximum">
               <number>65535</number>
@@ -755,8 +758,11 @@ peers still need to trust each other to allow connection. </string>
            </item>
            <item row="1" column="2">
             <widget class="QSpinBox" name="extPort">
+             <property name="toolTip">
+              <string>Acceptable ports range from 1024 to 65535. Ports below 1024 are reserved by your system.</string>
+             </property>
              <property name="minimum">
-              <number>0</number>
+              <number>1024</number>
              </property>
              <property name="maximum">
               <number>65535</number>