diff --git a/install3.php b/install3.php
index a89bd29..4fabcc0 100644
--- a/install3.php
+++ b/install3.php
@@ -141,10 +141,15 @@ if($_POST['action']=="save")
 		echo "<b>Done!</b><br />";
 		echo "Creating superuser account...";
 
-
 		$u = user_create('committee');
-		$u['firstname'] = '';
-		$u['lastname'] = 'Superuser Account';
+		if($_POST['firstname'] && $_POST['lastname']) {
+			$u['firstname']=mysql_escape_string(stripslashes($_POST['firstname']));
+			$u['lastname']=mysql_escape_string(stripslashes($_POST['lastname']));
+		}
+		else {
+			$u['firstname'] = 'Superuser';
+			$u['lastname'] = 'Account';
+		}
 		$u['emailprivate'] = mysql_escape_string(stripslashes($_POST['email']));
 		$u['username'] = mysql_escape_string(stripslashes($_POST['email']));
 		$u['password'] = mysql_escape_string(stripslashes($_POST['pass1']));
diff --git a/user.inc.php b/user.inc.php
index 7a6cde7..27eb33a 100644
--- a/user.inc.php
+++ b/user.inc.php
@@ -338,7 +338,7 @@ function user_create($type, $u = NULL)
 {
 	if(!is_array($u)) {
 		mysql_query("INSERT INTO users (`types`,`passwordset`,`created`) 
-				VALUES ('$type', '0000-00-00', NOW())");
+				VALUES ('$type', NOW(), NOW())");
 		$uid = mysql_insert_id();
 	} else {
 		/* The user has been specified and already exists,