diff --git a/core/boot.js b/core/boot.js
index 703424f11..687d10bb9 100644
--- a/core/boot.js
+++ b/core/boot.js
@@ -299,8 +299,8 @@ $tw.utils.PasswordPrompt.prototype.createPrompt = function(options) {
 	var self = this;
 	form.addEventListener("submit",function(event) {
 		// Collect the form data
-		var data = {};
-		for(var t=0; t<form.elements.length; t++) {
+		var data = {},t;
+		for(t=0; t<form.elements.length; t++) {
 			var e = form.elements[t];
 			if(e.name && e.value) {
 				data[e.name] = e.value;
@@ -315,6 +315,14 @@ $tw.utils.PasswordPrompt.prototype.createPrompt = function(options) {
 				promptInfo.form.parentNode.removeChild(promptInfo.form);
 				self.setWrapperDisplay();
 			}
+		} else {
+			// Clear the password if the callback returned false
+			for(t=0; t<form.elements.length; t++) {
+				var e = form.elements[t];
+				if(e.name === "password") {
+					form.elements[t].value = "";
+				}
+			}
 		}
 		event.preventDefault();
 		return false;