diff --git a/src/calibre/gui2/dialogs/config.py b/src/calibre/gui2/dialogs/config.py
index 73a5176857..707e1a1daf 100644
--- a/src/calibre/gui2/dialogs/config.py
+++ b/src/calibre/gui2/dialogs/config.py
@@ -109,6 +109,9 @@ class ConfigDialog(QDialog, Ui_Dialog):
         self.connect(self.view_logs, SIGNAL('clicked()'), self.view_server_logs)
         self.connect(self.stop, SIGNAL('clicked()'), self.stop_server)
         self.connect(self.test, SIGNAL('clicked()'), self.test_server)
+        self.connect(self.show_server_password, SIGNAL('stateChanged(int)'),
+                     lambda s: self.password.setEchoMode(self.password.Normal if s == Qt.Checked else self.password.Password))
+        self.password.setEchoMode(self.password.Password)
         opts = server_config().parse()
         self.port.setValue(opts.port)
         self.username.setText(opts.username)
diff --git a/src/calibre/gui2/dialogs/config.ui b/src/calibre/gui2/dialogs/config.ui
index cf0839db3c..94a0f96e29 100644
--- a/src/calibre/gui2/dialogs/config.ui
+++ b/src/calibre/gui2/dialogs/config.ui
@@ -72,7 +72,7 @@
      <item>
       <widget class="QStackedWidget" name="stackedWidget" >
        <property name="currentIndex" >
-        <number>3</number>
+        <number>0</number>
        </property>
        <widget class="QWidget" name="page_3" >
         <layout class="QVBoxLayout" name="verticalLayout" >
@@ -638,6 +638,13 @@
              </property>
             </widget>
            </item>
+           <item row="3" column="1" >
+            <widget class="QCheckBox" name="show_server_password" >
+             <property name="text" >
+              <string>&amp;Show password</string>
+             </property>
+            </widget>
+           </item>
           </layout>
          </item>
          <item>