diff --git a/.gitmodules b/.gitmodules
index ba3b7388b..2b1e9744c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule "src/3rdparty/libcrashreporter-qt"]
 	path = src/3rdparty/libcrashreporter-qt
 	url = git://github.com/dschmidt/libcrashreporter-qt.git
+[submodule "src/3rdparty/qtkeychain"]
+	path = src/3rdparty/qtkeychain
+	url = https://github.com/frankosterfeld/qtkeychain.git
diff --git a/src/3rdparty/qtkeychain b/src/3rdparty/qtkeychain
new file mode 160000
index 000000000..08be0593e
--- /dev/null
+++ b/src/3rdparty/qtkeychain
@@ -0,0 +1 @@
+Subproject commit 08be0593e100a041585bcc704a1bbc5a812a1682
diff --git a/src/gui/protocolwidget.ui b/src/gui/protocolwidget.ui
index 1569a89f8..247604308 100644
--- a/src/gui/protocolwidget.ui
+++ b/src/gui/protocolwidget.ui
@@ -57,7 +57,7 @@
      </column>
     </widget>
    </item>
-   <item row="2" column="1">
+   <item row="2" column="0" colspan="2">
     <widget class="QDialogButtonBox" name="_dialogButtonBox"/>
    </item>
   </layout>