diff --git a/src/gui/qt/settingsdialog.ui b/src/gui/qt/settingsdialog.ui
index a6d320cc..138934c3 100644
--- a/src/gui/qt/settingsdialog.ui
+++ b/src/gui/qt/settingsdialog.ui
@@ -1626,6 +1626,13 @@ p, li { white-space: pre-wrap; }
                 <bool>false</bool>
                </property>
                <layout class="QGridLayout" name="gridLayout_4">
+                <item row="2" column="0">
+                 <widget class="QLabel" name="label_37">
+                  <property name="text">
+                   <string>Server Password:</string>
+                  </property>
+                 </widget>
+                </item>
                 <item row="0" column="0">
                  <widget class="QLabel" name="label_41">
                   <property name="text">
@@ -1636,13 +1643,20 @@ p, li { white-space: pre-wrap; }
                   </property>
                  </widget>
                 </item>
-                <item row="0" column="1">
+                <item row="0" column="2">
                  <widget class="QLineEdit" name="lineEdit_InternetServerAddress">
                   <property name="maxLength">
                    <number>60</number>
                   </property>
                  </widget>
                 </item>
+                <item row="3" column="0">
+                 <widget class="QCheckBox" name="checkBox_useAvatarServer">
+                  <property name="text">
+                   <string>Avatar Server:</string>
+                  </property>
+                 </widget>
+                </item>
                 <item row="1" column="0">
                  <widget class="QLabel" name="label_31">
                   <property name="text">
@@ -1653,7 +1667,7 @@ p, li { white-space: pre-wrap; }
                   </property>
                  </widget>
                 </item>
-                <item row="1" column="1">
+                <item row="1" column="2">
                  <widget class="QSpinBox" name="spinBox_InternetServerPort">
                   <property name="minimum">
                    <number>80</number>
@@ -1666,16 +1680,16 @@ p, li { white-space: pre-wrap; }
                   </property>
                  </widget>
                 </item>
-                <item row="2" column="0">
-                 <widget class="QCheckBox" name="checkBox_useAvatarServer">
-                  <property name="text">
-                   <string>Avatar Server:</string>
+                <item row="3" column="2">
+                 <widget class="QLineEdit" name="lineEdit_avatarServerAddress"/>
+                </item>
+                <item row="2" column="2">
+                 <widget class="QLineEdit" name="lineEdit_InternetServerPassword">
+                  <property name="echoMode">
+                   <enum>QLineEdit::Password</enum>
                   </property>
                  </widget>
                 </item>
-                <item row="2" column="1">
-                 <widget class="QLineEdit" name="lineEdit_avatarServerAddress"/>
-                </item>
                </layout>
               </widget>
              </item>
diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
index 82153aca..bc66afb7 100644
--- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
+++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
@@ -239,6 +239,7 @@ void settingsDialogImpl::prepareDialog()
 
 	lineEdit_InternetServerListAddress->setText(QString::fromUtf8(myConfig->readConfigString("InternetServerListAddress").c_str()));
 	lineEdit_InternetServerAddress->setText(QString::fromUtf8(myConfig->readConfigString("InternetServerAddress").c_str()));
+	lineEdit_InternetServerPassword->setText(QString::fromUtf8(QByteArray::fromBase64(myConfig->readConfigString("ServerPassword").c_str())));
 	spinBox_InternetServerPort->setValue(myConfig->readConfigInt("InternetServerPort"));
 	checkBox_InternetServerUseIpv6->setChecked(myConfig->readConfigInt("InternetServerUseIpv6"));
 	checkBox_InternetServerUseSctp->setChecked(myConfig->readConfigInt("InternetServerUseSctp"));
@@ -691,6 +692,7 @@ void settingsDialogImpl::isAccepted()
 
 		myConfig->writeConfigInt("InternetServerConfigMode", 1);
 		myConfig->writeConfigString("InternetServerAddress", lineEdit_InternetServerAddress->text().toUtf8().constData());
+		myConfig->writeConfigString("ServerPassword", lineEdit_InternetServerPassword->text().toUtf8().toBase64().constData());
 		myConfig->writeConfigInt("InternetServerPort", spinBox_InternetServerPort->value());
 	}
 	if(checkBox_useAvatarServer->isChecked()) {