diff --git a/src/briar/gtk/containers/startup.py b/src/briar/gtk/containers/startup.py
index 251af6da828a5213337d0841e7ff2c0b5dd9a9a5..420790c69b0ca8760a69d9058fd948da3890bc3c 100644
--- a/src/briar/gtk/containers/startup.py
+++ b/src/briar/gtk/containers/startup.py
@@ -25,6 +25,9 @@ class StartupContainer(Container):
 
     def on_password_button_clicked(self, button):
         password = self.builder.get_object("password_entry").get_text()
+        password_confirm = self.builder.get_object("password_confirm_entry").get_text()
+        if password != password_confirm:
+            raise Exception("Passwords do not match")
         self._api.register((self.username, password), self._startup_finished)
 
     def on_login_pressed(self, button):