diff --git a/CHANGELOG.md b/CHANGELOG.md
index b19b2902..23f2df14 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
# PrivateBin version history
* **1.4 (not yet released)**
+ * FIXED: Password disabling option (#527)
* **1.3.1 (2019-09-22)**
* ADDED: Translation for Bulgarian (#455)
* CHANGED: Improved mobile UI - obscured send button and hard to click shortener button (#477)
diff --git a/index.php b/index.php
index 6bf0f5af..af3e1e10 100644
--- a/index.php
+++ b/index.php
@@ -7,7 +7,7 @@
* @link https://github.com/PrivateBin/PrivateBin
* @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
* @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.3
+ * @version 1.3.1
*/
// change this, if your php files and data is outside of your webservers document root
diff --git a/js/privatebin.js b/js/privatebin.js
index d411ebbe..717a3629 100644
--- a/js/privatebin.js
+++ b/js/privatebin.js
@@ -3814,7 +3814,8 @@ jQuery.PrivateBin = (function($, RawDeflate) {
*/
me.getPassword = function()
{
- return $passwordInput.val();
+ // when password is disabled $passwordInput.val() will return undefined
+ return $passwordInput.val() || '';
};
/**
diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php
index d9909343..3378c8f6 100644
--- a/tpl/bootstrap.php
+++ b/tpl/bootstrap.php
@@ -72,7 +72,7 @@ endif;
?>
-
+
diff --git a/tpl/page.php b/tpl/page.php
index e3d67732..2b63d113 100644
--- a/tpl/page.php
+++ b/tpl/page.php
@@ -50,7 +50,7 @@ endif;
?>
-
+