diff --git a/templates/register.html b/templates/register.html
index 35a44e7..e24615e 100644
--- a/templates/register.html
+++ b/templates/register.html
@@ -6,9 +6,19 @@
 
 		{{template "head"}}
 	
-		<script> 
-			$(document).ready(function() { 
-				$('#invalidCredentials').hide(); 
+		<script>
+            function checkPasswordMatch() {
+                var password = $("#password").val();
+                var confirmPassword = $("#password_confirm").val();
+                
+                if (password != confirmPassword)
+                    $("#divCheckPasswordMatch").html("Passwords do not match!");
+                else
+                    $("#divCheckPasswordMatch").html("Passwords match.");
+            }
+
+            $(document).ready(function () {
+                $("#password, #password_confirm").keyup(checkPasswordMatch);
 				$('#loginForm').ajaxForm({
 					success:    function() {
 						window.location.href = "/api/v1/restricted";
@@ -33,13 +43,12 @@
                 <input type="text" name="name" /><br />
 
 				<label for="password">Password</label>
-				<input type="password" name="password" /><br />
+				<input type="password" name="password" id="password" /><br />
 
 				<label for="password">Verify Password</label>
-				<input type="password" /><br />
+				<input type="password" id="password_confirm" /><br />
 
-				<div id="invalidCredentials">
-					The entered credentials are invalid
+				<div id="divCheckPasswordMatch">
 				</div>
 
 				<input type="submit" value="Login" />