diff --git a/core/users/signup.php b/core/users/signup.php
index c84d59bd4d..fca59820a3 100644
--- a/core/users/signup.php
+++ b/core/users/signup.php
@@ -201,6 +201,19 @@ if (count($_POST)>0 && check_str($_POST["persistform"]) != "1") {
 	$page["title"] = $text['title-user_add'];
 
 //show the content
+	echo "<script>";
+	echo "	function compare_passwords() {";
+	echo "		if (document.getElementById('password').value != document.getElementById('confirmpassword').value) {";
+	echo "			$('#password').addClass('formfld_highlight');";
+	echo "			$('#confirmpassword').addClass('formfld_highlight');";
+	echo "		}";
+	echo "		else {";
+	echo "			$('#password').removeClass('formfld_highlight');";
+	echo "			$('#confirmpassword').removeClass('formfld_highlight');";
+	echo "		}";
+	echo "	}";
+	echo "</script>";
+
 	echo "<div align='center'>";
 
 	$tablewidth ='width="100%"';
@@ -228,11 +241,11 @@ if (count($_POST)>0 && check_str($_POST["persistform"]) != "1") {
 
 	echo "	<tr>";
 	echo "		<td class='vncellreq'>".$text['label-password'].":</td>";
-	echo "		<td class='vtable'><input type='password' class='formfld' autocomplete='off' name='password' value='$password'></td>";
+	echo "		<td class='vtable'><input type='password' class='formfld' autocomplete='off' name='password' id='password' value='$password' onblur='compare_passwords();'></td>";
 	echo "	</tr>";
 	echo "	<tr>";
 	echo "		<td class='vncellreq'>".$text['label-confirm_password'].":</td>";
-	echo "		<td class='vtable'><input type='password' class='formfld' autocomplete='off' name='confirmpassword' value='$confirmpassword'></td>";
+	echo "		<td class='vtable'><input type='password' class='formfld' autocomplete='off' name='confirmpassword' id='confirmpassword' value='$confirmpassword' onblur='compare_passwords();'></td>";
 	echo "	</tr>";
 	echo "	<tr>";
 	echo "		<td class='vncellreq'>".$text['label-email'].":</td>";
diff --git a/core/users/usersupdate.php b/core/users/usersupdate.php
index 518b7cebcc..2e6019049a 100644
--- a/core/users/usersupdate.php
+++ b/core/users/usersupdate.php
@@ -373,6 +373,20 @@ else {
 
 //show the content
 	$table_width ='width="100%"';
+
+	echo "<script>";
+	echo "	function compare_passwords() {";
+	echo "		if (document.getElementById('password').value != document.getElementById('confirmpassword').value) {";
+	echo "			$('#password').addClass('formfld_highlight');";
+	echo "			$('#confirmpassword').addClass('formfld_highlight');";
+	echo "		}";
+	echo "		else {";
+	echo "			$('#password').removeClass('formfld_highlight');";
+	echo "			$('#confirmpassword').removeClass('formfld_highlight');";
+	echo "		}";
+	echo "	}";
+	echo "</script>";
+
 	echo "<form method='post' action=''>";
 
 	echo "<div align='center'>";
@@ -415,11 +429,11 @@ else {
 
 	echo "	<tr>";
 	echo "		<td class='vncell'>".$text['label-password'].":</td>";
-	echo "		<td class='vtable'><input type='password' autocomplete='off' class='formfld' name='password' value=\"\"></td>";
+	echo "		<td class='vtable'><input type='password' autocomplete='off' class='formfld' name='password' id='password' value='' onblur='compare_passwords();'></td>";
 	echo "	</tr>";
 	echo "	<tr>";
 	echo "		<td class='vncell'>".$text['label-confirm_password'].":</td>";
-	echo "		<td class='vtable'><input type='password' autocomplete='off' class='formfld' name='confirm_password' value=\"\"></td>";
+	echo "		<td class='vtable'><input type='password' autocomplete='off' class='formfld' name='confirm_password' id='confirmpassword' value='' onblur='compare_passwords();'></td>";
 	echo "	</tr>";
 
 	echo "	<tr>";
diff --git a/themes/enhanced/template.php b/themes/enhanced/template.php
index 0f3a34b2bc..00c8ee13c7 100644
--- a/themes/enhanced/template.php
+++ b/themes/enhanced/template.php
@@ -204,6 +204,13 @@ select.formfld {
 	padding: 4px;
 	}
 
+.formfld_highlight {
+	border-color: #aa2525;
+	-webkit-box-shadow: 0px 0px 3px #aa2525 inset;
+	-moz-box-shadow: 0px 0px 3px #aa2525 inset;
+	box-shadow: 0px 0px 3px #aa2525 inset;
+	}
+
 input.txt {
 	width: 98.75%;
 	}