} catch(NoSuchElementException e) {
		confirmPassword.addChild("input", new String[] {"type",     "name"},
		                                  new String[] {"password", "passwordVerification"});

<<<<<<< HEAD
	private void addPasswordForm(HTMLNode parent, String identity) {
		HTMLNode infobox = addInfobox(parent, "Choose a password");
		infobox.addChild("p", "While your account in being created, please select a password. This" +
				"will be used when logging in to your account from an email client");

		HTMLNode passwordForm = pluginRespirator.addFormChild(infobox, path(), "password");
		passwordForm.addChild("input", new String[] {"type",   "name",   "value"},
		                               new String[] {"hidden", "action", "setPassword"});

		//FIXME: Doing it this way allows the password of any identity to be changed
		passwordForm.addChild("input", new String[] {"type",   "name",     "value"},
		                               new String[] {"hidden", "identity", identity});

		passwordForm.addChild("input", new String[] {"type",     "name"},
		                               new String[] {"password", "password"});
		passwordForm.addChild("input", new String[] {"type",     "name"},
		                               new String[] {"password", "passwordVerify"});
		passwordForm.addChild("input", new String[] {"type", "name", "value"},
		                               new String[] {"submit", "submit", "Set password"});
	}

	private void makeWebPagePost(ToadletContext ctx, HTTPRequest req) throws ToadletContextClosedException, IOException {
		String action;
		try {
			action = req.getPartAsStringThrowing("action", 64);
		} catch(SizeLimitExceededException e) {
			//Someone is deliberately passing bad data, or there is a bug in the PUT code
			Logger.error(this, "Got action that was too long. First 100 bytes: " + req.getPartAsStringFailsafe("action", 100));

			//TODO: Write a better message
			writeHTMLReply(ctx, 200, "OK", "The request contained bad data. This is probably a bug in Freemail");
			return;
		} catch(NoSuchElementException e) {
			action = "addAccount";
		}
			Logger.error(this, "Got OwnIdentityID that was too long. First 100 bytes: " + req.getPartAsStringFailsafe("OwnIdentityID", 100));

			//TODO: Write a better message
			//Someone is deliberately passing bad data, or there is a bug in the PUT code

			writeHTMLReply(ctx, 200, "OK", "The request contained bad data. This is probably a bug in Freemail");
			return;
		if("addAccount".equals(action)) {
			addAccount(ctx, req);
		} else if("setPassword".equals(action)) {
			setPassword(ctx, req);
		} else {
			Logger.error(this, "Got unknown action: " + action);
			//TODO: Write a better message
			writeHTMLReply(ctx, 200, "OK", "The request contained bad data. This is probably a bug in Freemail");
		}
	}

	private void addAccount(ToadletContext ctx, HTTPRequest req) throws ToadletContextClosedException, IOException {
		//Get the identity id
		String identity;
		try {
			identity = req.getPartAsStringThrowing("OwnIdentityID", 64);
		} catch(SizeLimitExceededException e) {
			//Someone is deliberately passing bad data, or there is a bug in the PUT code
			Logger.error(this, "Got POST request without OwnIdentityID");

			//TODO: Write a better message
			writeHTMLReply(ctx, 200, "OK", "The request didn't contain the expected data. This is probably a bug in Freemail");
			return;
		}

		AccountCreationTask task = new AccountCreationTask(accountManager, identity, wotConnection);
		FreemailPlugin.getExecutor().submit(task);
		synchronized(accountCreationTasks) {
			accountCreationTasks.add(task);
		}

		writeTemporaryRedirect(ctx, "Account added, redirecting to login page", getIdentityStatusPath(identity));
	}

	private void setPassword(ToadletContext ctx, HTTPRequest req) throws ToadletContextClosedException, IOException {
=======
		addAccountForm.addChild("input", new String[] { "type", "name", "value" }, new String[] { "submit", "submit", FreemailL10n.getString("Freemail.AddAccountToadlet.submit") });

		writeHTMLReply(ctx, 200, "OK", pageNode.generate());
	}

	private void makeWebPagePost(ToadletContext ctx, HTTPRequest req) throws ToadletContextClosedException, IOException {
		//Check the form password
		String pass;
		try {
			pass = req.getPartAsStringThrowing("formPassword", 32);
		} catch(SizeLimitExceededException e) {
			writeHTMLReply(ctx, 403, "Forbidden", "Form password too long");
			return;
		} catch(NoSuchElementException e) {
			writeHTMLReply(ctx, 403, "Forbidden", "Missing form password");
			return;
		}

		if((pass.length() == 0) || !pass.equals(pluginRespirator.getNode().clientCore.formPassword)) {
			writeHTMLReply(ctx, 403, "Forbidden", "Invalid form password.");
			return;
		}

>>>>>>> 6b08747fb50c17df5a39287a415c15e68fa28e96
		//Get the identity id
		String identity = req.getPartAsStringFailsafe("OwnIdentityID", 64);

		confirmPassword.addChild("input", new String[] {"type",     "name"},
		                                  new String[] {"password", "passwordVerification"});

		addAccountForm.addChild("input", new String[] { "type", "name", "value" }, new String[] { "submit", "submit", FreemailL10n.getString("Freemail.AddAccountToadlet.submit") });

		writeHTMLReply(ctx, 200, "OK", pageNode.generate());
	}

	private void makeWebPagePost(ToadletContext ctx, HTTPRequest req) throws ToadletContextClosedException, IOException {
		//Check the form password
		String pass;
		try {
			pass = req.getPartAsStringThrowing("formPassword", 32);
		} catch(SizeLimitExceededException e) {
			writeHTMLReply(ctx, 403, "Forbidden", "Form password too long");
			return;
		} catch(NoSuchElementException e) {
			writeHTMLReply(ctx, 403, "Forbidden", "Missing form password");
			return;
		}

		if((pass.length() == 0) || !pass.equals(pluginRespirator.getNode().clientCore.formPassword)) {
			writeHTMLReply(ctx, 403, "Forbidden", "Invalid form password.");
			return;
		}

		//Get the identity id
		String identity = req.getPartAsStringFailsafe("OwnIdentityID", 64);