diff --git a/boot/boot.css.tid b/boot/boot.css.tid
index 90ab69d31..27c8884cd 100644
--- a/boot/boot.css.tid
+++ b/boot/boot.css.tid
@@ -20,7 +20,7 @@ Error message and password prompt
 	width: 50%;
 	margin-left: 25%;
 	margin-top: 4em;
-	padding: 0 2em 2em 2em;
+	padding: 0 2em 1em 2em;
 }
 
 .tc-error-form h1 {
@@ -30,14 +30,13 @@ Error message and password prompt
 .tc-error-prompt {
 	text-align: center;
 	color: #000;
-	margin-bottom: 1em;
 }
 
 .tc-error-message {
 	overflow: auto;
 	max-height: 40em;
 	padding-right: 1em;
-	margin-bottom: 1em;
+	margin: 1em 0;
 	white-space: pre-line;
 }
 
diff --git a/boot/boot.js b/boot/boot.js
index 688300c12..458fdfd1f 100644
--- a/boot/boot.js
+++ b/boot/boot.js
@@ -136,7 +136,7 @@ $tw.utils.error = function(err) {
 			heading = dm("h1",{text: errHeading}),
 			prompt = dm("div",{text: promptMsg, "class": "tc-error-prompt"}),
 			message = dm("div",{text: err, "class":"tc-error-message"}),
-			button = dm("button",{text: ( $tw.language == undefined ? "close" : $tw.language.getString("Buttons/Close/Caption") )}),
+			button = dm("div",{children: [dm("button",{text: ( $tw.language == undefined ? "close" : $tw.language.getString("Buttons/Close/Caption") )})], "class": "tc-error-prompt"}),
 			form = dm("form",{children: [heading,prompt,message,button], "class": "tc-error-form"});
 		document.body.insertBefore(form,document.body.firstChild);
 		form.addEventListener("submit",function(event) {
@@ -2208,6 +2208,7 @@ $tw.boot.boot = function(callback) {
 	// Initialise password prompter
 	if($tw.browser && !$tw.node) {
 		$tw.passwordPrompt = new $tw.utils.PasswordPrompt();
+		error
 	}
 	// Preload any encrypted tiddlers
 	$tw.boot.decryptEncryptedTiddlers(function() {