diff --git a/ldap.go b/ldap.go
index 8d38366..84d1745 100644
--- a/ldap.go
+++ b/ldap.go
@@ -9,6 +9,9 @@ import (
 )
 
 func createLDAPAccount(uname string, pwd string, email string) error {
+	if uname == "" || pwd == "" || email == "" {
+		return errors.New("Missing field")
+	}
 	url := Conf.Ldap.Url
 	newdn := fmt.Sprintf("%v=%v,%v,%v", Conf.Ldap.UserAttr, uname, Conf.Ldap.UserOu, Conf.Ldap.LdapDc)
 	binddn := fmt.Sprintf("%v,%v", Conf.Ldap.AdminUser, Conf.Ldap.LdapDc)
diff --git a/templates/register.html b/templates/register.html
index e456dc7..6eb140a 100644
--- a/templates/register.html
+++ b/templates/register.html
@@ -13,11 +13,11 @@
 		</tr>
 		<tr>
 			<td>Password:</td>
-			<td><input type="password" id="psw" name="psw" pattern="(?=.*\d)(?=.*[a-z]).{8,}" title="Must contain at least one number and at least 8 or more characters" required></td>
+			<td><input type="password" id="password" name="password" pattern="(?=.*\d)(?=.*[a-z]).{8,}" title="Must contain at least one number and at least 8 or more characters" required></td>
 		</tr>
 		<tr>
 			<td>Confirm Password:</td>
-			<td><input type="password" name="confirm_password" id="confirm_psw" onchange="check()"/></td>
+			<td><input type="password" name="confirm_password" id="confirm_password" onchange="check()"/></td>
 			<td><span id='message'></span></td>
 		<tr>
 			<td>Secret:</td>
@@ -39,8 +39,8 @@
 </div>
 	<script>
 function check() {
-    if(document.getElementById('psw').value ===
-            document.getElementById('confirm_psw').value) {
+    if(document.getElementById('password').value ===
+            document.getElementById('confirm_password').value) {
         document.getElementById('message').innerHTML = "Passwords match";
     } else {
         document.getElementById('message').innerHTML = "Passwords don't match";