diff --git a/core/modules/startup.js b/core/modules/startup.js
index 1a97e22c1..a1fe1b537 100755
--- a/core/modules/startup.js
+++ b/core/modules/startup.js
@@ -103,8 +103,11 @@ exports.startup = function() {
 				serviceName: "Set a new password for this TiddlyWiki",
 				noUserName: true,
 				submitText: "Set password",
+				canCancel: true,
 				callback: function(data) {
-					$tw.crypto.setPassword(data.password);
+					if(data) {
+						$tw.crypto.setPassword(data.password);
+					}
 					return true; // Get rid of the password prompt
 				}
 			});