diff --git a/app/src/main/java/com/zeapo/pwdstore/GitHandler.java b/app/src/main/java/com/zeapo/pwdstore/GitHandler.java
index bf2b92b58..497543b1c 100644
--- a/app/src/main/java/com/zeapo/pwdstore/GitHandler.java
+++ b/app/src/main/java/com/zeapo/pwdstore/GitHandler.java
@@ -172,7 +172,7 @@ public class GitHandler extends ActionBarActivity {
                 };
 
                 server_url.setText(settings.getString("git_remote_server", ""));
-                server_port.setText(settings.getString("git_remote_server_port", ""));
+                server_port.setText(settings.getString("git_remote_port", ""));
                 server_user.setText(settings.getString("git_remote_username", ""));
                 server_path.setText(settings.getString("git_remote_location", ""));
 
diff --git a/libraries/openpgp-api-lib b/libraries/openpgp-api-lib
index 0be263d5d..89b0a3bd1 160000
--- a/libraries/openpgp-api-lib
+++ b/libraries/openpgp-api-lib
@@ -1 +1 @@
-Subproject commit 0be263d5d3effd2df5f976fa4a127017268749cc
+Subproject commit 89b0a3bd140dd178595c031beaa27747575d7ac8