diff --git a/mod/register.php b/mod/register.php
index 3ba714c74..bc1603f25 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -64,6 +64,12 @@ function register_post(&$a) {
 			break;
 	}
 
+
+	if((! $_POST['password']) || ($_POST['password'] !== $_POST['password2'])) {
+		notice( t('Passwords do not match.') . EOL);
+		return;
+	}
+
 	$arr = $_POST;
 	$arr['account_flags'] = $flags;