diff --git a/style/pws.css b/style/pws.css
index 84171fc..22eeca0 100644
--- a/style/pws.css
+++ b/style/pws.css
@@ -61,3 +61,11 @@ a {
 	cursor: pointer;
 }
 
+span.button {
+	text-decoration: underline;
+	cursor: pointer;
+}
+
+#addpassword {
+}
+
diff --git a/templates/search.tpl b/templates/search.tpl
index deda6aa..1f9fb9d 100644
--- a/templates/search.tpl
+++ b/templates/search.tpl
@@ -2,6 +2,39 @@
 		<h2>Search</h2>
 		<div id="error"></div>
 		<input type="text" id="query" name="query" /><input type="button" id="clearsearch" value="" class="submit" />
+		<div id="addpassword">
+			<h2 id="passeditor_title">Add new password</h2>
+			<table>
+				<tr class="required">
+					<td>Short description</td>
+					<td><input type="text" name="short" /></td>
+				</tr>
+				<tr>
+					<td>Long description</td>
+					<td><textarea name="long"></textarea></td>
+				</tr>
+				<tr>
+					<td>Username</td>
+					<td><input type="text" name="username" /></td>
+				</tr>
+				<tr class="required">
+					<td>Password (twice)</td>
+					<td>
+						<input type="password" name="password1" value="" /><br />
+						<input type="password" name="password2" value="" />
+					</td>
+				</tr>
+				<tr>
+					<td>Additional information</td>
+					<td><textarea name="additional"></textarea></td>
+				</tr>
+				<tr>
+					<td>Available in groups</td>
+					<td><select name="pwgroups[]"></select></td>
+				</tr>
+			</table>
+			<input type="button" id="save_password" value="Save" class="submit" />
+		</div>
 		<div id="results"></div>
 		<div id="info"></div>
 		<div id="passwordgroups">