diff --git a/php/domainlist.php b/php/domainlist.php
index 9e2cc1d..36f4c8a 100644
--- a/php/domainlist.php
+++ b/php/domainlist.php
@@ -1,13 +1,13 @@
 <?php
 require("wantauth.php");
 require("tools.php");
+$dbh=db_open();
 session_start();
 include("userhead.php");
 include("domainstatustypes.php");
 ?>
 <div>
 <?php
-$dbh=db_open();
 $query=sprintf("SELECT * FROM domain WHERE client=%d",
 	       $_SESSION["client"]);
 $result=pg_query($dbh, $query);
@@ -26,7 +26,6 @@ else {
   }
   print("</table>");
 }
-db_close($dbh);
 ?>
 </div>
 <a href="registerdomain.php"><?php print(_("Add domain")); ?></a>
diff --git a/php/registerdomain.php b/php/registerdomain.php
index d4aae7d..88c3d33 100644
--- a/php/registerdomain.php
+++ b/php/registerdomain.php
@@ -1,7 +1,43 @@
 <?php
+require_once("tools.php");
+require_once("usertypes.php");
+$dbh = db_open();
+
+function add_domain() {
+  global $dbh;
+  $query = sprintf("INSERT INTO domain (domainname, client) VALUES ('%s', %d)",
+		   $_POST["domainname"],
+		   $_SESSION["client"]);
+  db_exec($dbh, $query);
+}
+
 require("wantauth.php");
-require("tools.php");
 session_start();
+
 include("userhead.php");
+if (!isset($_POST["mode"])) {
+  $mode = "step1";
+} else {
+  $mode = $_POST["mode"];
+}
+
+switch ($mode) {
+ case "step1" :
+?>
+<p><?php print(_("Add new domain")); ?></p>
+<form action="<?php echo $PHP_SELF; ?>" method="post">
+<input type="hidden" name="mode" value="commit">
+<table>
+<tr><td><?php print(_("Domain name:")); ?></td><td><input type="text" name="domainname"></td></tr>
+<tr><td colspan="2" align="right"><input type="submit" name="submit" value="<?php print(_("add")); ?>"</td></tr>
+</table>
+</form>
+<?php
+   break;
+ case "commit" :
+   add_domain();
+ default:
+   break;
+}
 include("commonfoot.php");
 ?>
\ No newline at end of file
diff --git a/php/setup.php b/php/setup.php
index 2bc9c8d..00af044 100644
--- a/php/setup.php
+++ b/php/setup.php
@@ -1,5 +1,4 @@
 <?php
-
 require("tools.php");
 require("usertypes.php");
 $dbh=db_open();
@@ -98,14 +97,8 @@ function has_admin_account() {
   $result=db_query($dbh, $query);
   return (db_num_rows($result)!=0);
 }
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>GNU-Viech Administration tool Setup</title>
-</head>
-<body>
-<?php 
+
+include("commonhead.php");
 if (!isset($_POST["mode"])) {
   $mode = "step1";
 } else {
diff --git a/php/start.php b/php/start.php
index 8ff4059..2b2e3b1 100644
--- a/php/start.php
+++ b/php/start.php
@@ -3,11 +3,12 @@ require("wantauth.php");
 require("tools.php");
 
 $dbh = db_open();
+
 $username = strtolower(substr(trim($_SERVER['PHP_AUTH_USER']), 0, 12));
 $password = md5(substr(trim($_SERVER['PHP_AUTH_PW']), 0, 30));
 $query = "SELECT * FROM sysuser WHERE name='$username' AND md5pass='$password'";
 //echo $query;
-$result = pg_query($dbh, $query) or die("query failed");
+$result = db_query($dbh, $query) or die("query failed");
 
 if (pg_num_rows($result) == 0) {
   $logged_in = false;
@@ -20,7 +21,6 @@ if (pg_num_rows($result) == 0) {
   $row=pg_fetch_array($result);
   $_SESSION["userid"]=$row["id"];
 }
-pg_close($dbh);
 
 include("commonhead.php");
 ?>
diff --git a/php/userhead.php b/php/userhead.php
index dc8451b..292ef88 100644
--- a/php/userhead.php
+++ b/php/userhead.php
@@ -8,9 +8,7 @@ include("commonhead.php");
 </td><td>
 <p>
 <?php
-require("usertypes.php");
-
-$dbh = db_open();
+require_once("usertypes.php");
 
 $query=sprintf("SELECT name, type, client FROM sysuser WHERE id=%d",
 	       $_SESSION["userid"]);
@@ -28,8 +26,6 @@ $row=pg_fetch_array($result);
 printf("%s %s, %s %s, %s %s, %s %s", $row["firstname"], $row["lastname"],
        $row["address1"], $row["address2"], $row["zipcode"], $row["town"],
        $row["state"], $row["cname"]);
-
-db_close($dbh);
 ?>
 </p></td></tr></table>
 </div>
\ No newline at end of file
