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() || '';
         };
 
         /**