diff --git a/docs/login.php b/docs/login.php
index 32e8882..3fbd63e 100644
--- a/docs/login.php
+++ b/docs/login.php
@@ -1,5 +1,6 @@
 <?php
     require("../libs/page.php");
+    require("../libs/form.php");
     
     function post_handler() {
         global $db;
@@ -38,27 +39,10 @@
         
     $form_message = post_handler();
     
-    // TODO: form builder. this is lazy for testing purposes
-?>
+    form("Log in", $form_message, array(
+        array('key' => 'Username', 'type' => 'text', 'name' => 'user', 'default' => ''),
+        array('key' => 'Password', 'type' => 'password', 'name' => 'pass', 'default' => '')
+    ));
 
-<form class='form' enctype="multipart/form-data" method="POST">
-    <h1 class="form-heading">
-        Join
-    </h1>
-    <span class='form-message'>
-        <?php echo $form_message ?>
-    </span>
-    <span class='form-key'>
-        Username
-    </span>
-    <input class='form-input' type="text" name="user" value="">
-    <span class='form-key'>
-        Password
-    </span>
-    <input class='form-input' type="password" name="pass" value="">
-    <input class='form-button' type="Submit" name="Submit">
-</form>
-
-<?php
     page_footer();
 ?>
\ No newline at end of file
diff --git a/docs/register.php b/docs/register.php
index 60e2e90..1268edd 100644
--- a/docs/register.php
+++ b/docs/register.php
@@ -1,5 +1,6 @@
 <?php
     require("../libs/page.php");
+    require("../libs/form.php");
     
     function post_handler() {
         global $db;
@@ -46,32 +47,12 @@
     page_header();
         
     $form_message = post_handler();
+       
+    form("Join", $form_message, array(
+        array('key' => 'Username', 'type' => 'text', 'name' => 'user', 'default' => ''),
+        array('key' => 'Password', 'type' => 'password', 'name' => 'pass', 'default' => ''),
+        array('key' => 'Password (again)', 'type' => 'password', 'name' => 'pass2', 'default' => '')
+    ));
     
-    // TODO: form builder. this is lazy for testing purposes
-?>
-
-<form class='form' enctype="multipart/form-data" method="POST">
-    <h1 class="form-heading">
-        Join
-    </h1>
-    <span class='form-message'>
-        <?php echo $form_message ?>
-    </span>
-    <span class='form-key'>
-        Username
-    </span>
-    <input class='form-input' type="text" name="user" value="">
-    <span class='form-key'>
-        Password
-    </span>
-    <input class='form-input' type="password" name="pass" value="">
-    <span class='form-key'>
-        Password (again)
-    </span>
-    <input class='form-input' type="password" name="pass2" value="">
-    <input class='form-button' type="Submit" name="Submit">
-</form>
-
-<?php
     page_footer();
 ?>
\ No newline at end of file
diff --git a/libs/form.php b/libs/form.php
new file mode 100644
index 0000000..610ce0c
--- /dev/null
+++ b/libs/form.php
@@ -0,0 +1,27 @@
+<?php
+    function form($title, $form_message, $inputs) { ?>
+        <form class='form' enctype="multipart/form-data" method="POST">
+            <h1 class="form-heading">
+                <?php echo $title ?>
+            </h1>
+            <span class='form-message'>
+                <?php echo $form_message ?>
+            </span>
+            <?php
+                foreach ($inputs as $kv) { ?>
+                    <span class='form-key'>
+                        <?php echo $kv['key'] ?>
+                    </span>
+                    
+                    <<?php echo (($kv['type'] == 'textarea') ? 'textarea' : 'input') ?>
+                        class='form-input' 
+                        type="<?php echo $kv['type'] ?>"
+                        name="<?php echo $kv['name'] ?>" 
+                        value="<?php echo $kv['default'] ?>"
+                    >
+                <?php }
+            ?>
+            <input class='form-button' type="Submit" name="Submit">
+        </form>
+    <?php }
+?>
\ No newline at end of file