diff --git a/Config.h b/Config.h
index 4db4a82..aad4e52 100644
--- a/Config.h
+++ b/Config.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#define NUKI_HUB_VERSION "8.12"
+#define NUKI_HUB_VERSION "8.13"
 
 #define MQTT_QOS_LEVEL 1
-#define MQTT_CLEAN_SESSIONS false
\ No newline at end of file
+#define MQTT_CLEAN_SESSIONS false
diff --git a/Config.h.save b/Config.h.save
new file mode 100644
index 0000000..aad4e52
--- /dev/null
+++ b/Config.h.save
@@ -0,0 +1,6 @@
+#pragma once
+
+#define NUKI_HUB_VERSION "8.13"
+
+#define MQTT_QOS_LEVEL 1
+#define MQTT_CLEAN_SESSIONS false
diff --git a/WebCfgServer.cpp b/WebCfgServer.cpp
index 91de67a..39c7b56 100644
--- a/WebCfgServer.cpp
+++ b/WebCfgServer.cpp
@@ -556,7 +556,7 @@ void WebCfgServer::buildCredHtml(String &response)
 
     if(_nuki != nullptr)
     {
-        response.concat("<br><br><FORM ACTION=method=get >");
+        response.concat("<br><br><FORM method=\"post\" ACTION=savecfg >");
         response.concat("<h3>NUKI Lock PIN</h3>");
         response.concat("<table>");
         printInputField(response, "NUKIPIN", "PIN Code (# to clear)", "*", 20, true);
@@ -567,7 +567,7 @@ void WebCfgServer::buildCredHtml(String &response)
 
     if(_nukiOpener != nullptr)
     {
-        response.concat("<br><br><FORM ACTION=method=get >");
+        response.concat("<br><br><FORM method=\"posst\" ACTION=savecfg >");
         response.concat("<h3>NUKI Opener PIN</h3>");
         response.concat("<table>");
         printInputField(response, "NUKIOPPIN", "PIN Code (# to clear)", "*", 20, true);
@@ -580,7 +580,7 @@ void WebCfgServer::buildCredHtml(String &response)
     if(_nuki != nullptr)
     {
         response.concat("<br><br><h3>Unpair NUKI Lock</h3>");
-        response.concat("<form method=\"get\" action=\"/unpairlock\">");
+        response.concat("<form method=\"post\" action=\"/unpairlock\">");
         String message = "Type ";
         message.concat(_confirmCode);
         message.concat(" to confirm unpair");
@@ -591,7 +591,7 @@ void WebCfgServer::buildCredHtml(String &response)
     if(_nukiOpener != nullptr)
     {
         response.concat("<br><br><h3>Unpair NUKI Opener</h3>");
-        response.concat("<form method=\"get\" action=\"/unpairopener\">");
+        response.concat("<form method=\"post\" action=\"/unpairopener\">");
         String message = "Type ";
         message.concat(_confirmCode);
         message.concat(" to confirm unpair");