diff --git a/server/index.php b/server/index.php
index 4e215cf..040b77b 100644
--- a/server/index.php
+++ b/server/index.php
@@ -167,6 +167,7 @@ if ($user != "")
     echo "<input type=\"button\" name=\"add\" value=\"Add\" onclick=\"add_password();\"/>";
     echo "<br />";
     echo '<div><a href="http://en.wikipedia.org/wiki/Password_strength">Master key strength</a><div id="scorebarBorder"><div id="score">0%</div><div id="scorebar">&nbsp;</div></div></div>';
+    echo "<input type=\"button\" name=\"clear\" value=\"Clear Form\" onclick=\"clear_form();\"/>";
 }
 ?>
 </div>
diff --git a/server/resources/gpass.js b/server/resources/gpass.js
index 6106ef7..db2f42f 100755
--- a/server/resources/gpass.js
+++ b/server/resources/gpass.js
@@ -109,6 +109,21 @@ function generate_simple_password()
     document.getElementById("new_password").value = _generate_random(8, symbols);
 }
 
+function clear_form()
+{
+    div = document.getElementById("add_new_password");
+    
+    inputs = div.getElementsByTagName("input");
+
+    for(i=0; i<inputs.length; i++)
+    {
+	if (inputs[i].type == "text" ||
+	    inputs[i].type == "password")
+	    inputs[i].value = "";
+    }
+    chkPass("");
+}
+
 function url_domain(data) {
     var uri = parseUri(data)
    return uri['host'];