diff --git a/schoolstudents.php b/schoolstudents.php
index b95917b..0c0dd12 100644
--- a/schoolstudents.php
+++ b/schoolstudents.php
@@ -4,32 +4,67 @@ require_once('user.inc.php');
 
 if($_SESSION['schoolid'] && $_SESSION['schoolaccesscode'] && $conference['type'] == 'scienceolympics'){
 
-	if($_GET['action'] == 'new'){
-		$results = process_newRecord($_POST['firstName'], $_POST['lastName'], $_POST['email']);
-		if($results !== true){
-			echo "<script type=\"text/javascript\">var savedRecord = false;</script>";
-			error_($results);
-		}else{
-			echo "<script type=\"text/javascript\">var savedRecord = true;</script>";
-		}
-	}else if($_GET['action'] == 'delete'){
-		if(!delete_record($_POST['uid'])){
-			echo "<script type=\"text/javascript\">var deletedRecord = false;</script>";
-			error_("Unable to delete record");
-		}else{
-			echo "<script type=\"text/javascript\">var deletedRecord = true;</script>";
-		}
-	}else{
-		$title = i18n("Manage Students");
-		send_header($title, array("School Home" => "schoolaccess.php"));
-		draw_javascript();
-		draw_list();
-		send_footer();
+	switch($_GET['action']){
+		case 'new':
+			$results = process_newRecord($_POST['firstName'], $_POST['lastName'], $_POST['email']);
+			if($results !== true){
+				echo "<script type=\"text/javascript\">var success = false;</script>";
+				error_($results);
+			}else{
+				echo "<script type=\"text/javascript\">var success = true;</script>";
+			}
+			break;
+
+		case 'update':
+			$results = alter_record($_POST['recordId'], $_POST['firstName'], $_POST['lastName'], $_POST['email']);
+			if($results !== true){
+				echo "<script type=\"text/javascript\">var success = false;</script>";
+				error_($results);
+			}else{
+				echo "<script type=\"text/javascript\">var success = true;</script>";
+			}
+			break;
+
+		case 'delete':
+			if(!delete_record($_POST['uid'])){
+				echo "<script type=\"text/javascript\">var success = false;</script>";
+				error_("Unable to delete record");
+			}else{
+				echo "<script type=\"text/javascript\">var success = true;</script>";
+			}
+			break;
+
+		default:
+			$title = i18n("Manage Students");
+			send_header($title, array("School Home" => "schoolaccess.php"));
+			draw_javascript();
+			draw_list();
+			send_footer();
 	}
 }else{
 	header('Location: schoolaccess.php');
 }
 
+// alter an existing user record.  returns true on success, error message on failure
+function alter_record($uid, $firstName, $lastName, $email){
+	global $conference;
+	$returnval = true;
+	$firstName = trim($firstName);
+	$lastName = trim($lastName);
+	$email = strtolower(trim($email));
+	$user = user_load(null, $uid);
+	if($user){
+		$user['firstname'] = $firstName;
+		$user['lastname'] = $lastName;
+		$user['email'] = $email;
+		user_save($user);
+		echo user_row($uid, $user['username'], $firstName, $lastName, $email);
+	}else{
+		$returnval = "User not found";
+	}
+	return $returnval;
+}
+
 // create a new record with the given first name last name and e-mail address
 // return true on success, error message on failure
 function process_newRecord($firstName, $lastName, $email){
@@ -40,25 +75,18 @@ function process_newRecord($firstName, $lastName, $email){
 	$uid = null;
 
 	// make sure we are actually given a first and last name
-	if(strlen($firstName) == 0 || strlen($lastName) == 0) return "First and last names are required fields";
+	if(strlen($firstName) == 0 || strlen($lastName) == 0){
+		return "First and last names are required fields";
+	}
+
+	// if they have an e-mail address, make sure it's not already in use
 	if($email != null){
 		$user = user_load_by_email($email);
-		
 	}else{
 		$user = false;
 	}
 	if($user != false){
-		// we're adding an existing user.  First find out if they are in the school we have specified
 		return "e-mail address is already in use";
-//		$user['firstname'] = $firstName;
-//		$user['lastname'] = $lastName;
-
-/*
-		$query = "INSERT INTO users_conferences_link(conferences_id, users_uid) VALUES(";
-		$query .= $conference['id'] . ', ' . $user['uid'];
-		$firstName = $user['firstname'];
-		$lastName = $user['lastname'];
-*/
 	}else{
 		// we're creating a new user
 		if(strlen($email) != 0){
@@ -87,20 +115,27 @@ function process_newRecord($firstName, $lastName, $email){
 		$user = user_create('student', $username);
 		$user['firstname'] = $firstName;
 		$user['lastname'] = $lastName;
+		$user['active'] = 'yes';
+		$user['complete'] = 'yes';
 		if($username == $email)
 			$user['email'] = $email;
 		$user['schools_id'] = $_SESSION['schoolid'];
 		user_save($user);
-		$uid = $user['uid'];
 	}
 
+	$uid = $user['uid'];
 	echo user_row($uid, $username, $firstName, $lastName, $email);
 	return true;
 }
 
+// generate the table row for thisa given record
 function user_row($uid, $username, $firstName, $lastName, $email){
 	$rval = "<tr id=\"$uid\">";
-	$rval .= "<td>$username</td>";
+	$rval .= "<td onclick=\"populate($uid);\"";
+	$rval .= " onmouseover=\"document.body.style.cursor='pointer';\"";
+	$rval .= " onmouseout=\"document.body.style.cursor='auto';\"";
+	$rval .= ">$username</td>";
+
 	$rval .= "<td>$firstName</td>";
 	$rval .= "<td>$lastName</td>";
 	$rval .= "<td>$email</td>";
@@ -126,6 +161,29 @@ function draw_javascript(){
 <script type="text/javascript">
 	var awaiting_ajax = false; // used to prevent the same record from being submitted multiple times
 
+	// populate the edit fields with this user's info
+	function populate(uid){
+		// extract the user's info from our table
+		var n = 0;
+		$('#' + uid + ' > td').each(function() {
+			switch(n){
+				case 1: $('#newFirstName').attr({value:this.innerHTML}); break;
+				case 2: $('#newLastName').attr({value:this.innerHTML}); break;
+				case 3: $('#newEmail').attr({value:this.innerHTML}); break;
+			}
+			n++;
+		});
+		$('#existingRecordId').attr({value:uid});
+	}
+
+	function clearFields(){
+		$('#newFirstName').select();
+		$('#existingRecordId').attr({ value: -1 });
+		$('#newFirstName').attr({ value: '' });
+		$('#newLastName').attr({ value: '' });
+		$('#newEmail').attr({ value: '' });
+	}
+
 	function deleteRecord(uid){
 		var params;
 		if(awaiting_ajax) return false;
@@ -134,7 +192,7 @@ function draw_javascript(){
 		params = [{ 'name' : 'uid', 'value' : uid }];
 
 		$("#debug").load("schoolstudents.php?action=delete", params, function(response){
-			if(deletedRecord){
+			if(success){
 				$('#' + uid).remove();
 			}
 			awaiting_ajax = false;
@@ -142,37 +200,48 @@ function draw_javascript(){
 
 	}
 
-	function addNewRecord(){
+	function saveRecord(){
 		var params;
 		var firstName = $('#newFirstName').val();
 		var lastName = $('#newLastName').val();
 		var email = $('#newEmail').val();
+		var recordId = $('#existingRecordId').val();
 
 		if(firstName == '' || lastName == ''){
 			notice_create('error', '<?=i18n('First and last names are required fields'); ?>', 5000);
 
 			return false;
 		}
+
+		// don't allow multiple submits
 		if(awaiting_ajax) return false;
 		awaiting_ajax = true;
 
 		params = [
-			{ 'name' : 'firstName', 'value': firstName },
-			{ 'name' : 'lastName', 'value': lastName },
-			{ 'name' : 'email', 'value': email }
+			{ 'name' : 'recordId', 'value' : recordId },
+			{ 'name' : 'firstName', 'value' : firstName },
+			{ 'name' : 'lastName', 'value' : lastName },
+			{ 'name' : 'email', 'value' : email }
 		];
 
-		$("#debug").load("schoolstudents.php?action=new", params, function(response){
-			if(savedRecord){
-				$('#studentList > tbody:last').append(response);
-				$('#newFirstName').select();
-				$('#newFirstName').attr({ value: '' });
-				$('#newLastName').attr({ value: '' });
-				$('#newEmail').attr({ value: '' });
-			}
-			awaiting_ajax = false;
-		});
-
+		if(recordId != -1){
+			$("#debug").load("schoolstudents.php?action=update", params, function(response){
+				if(success){
+					$('#' + recordId).remove();
+					$('#studentList > tbody:last').append(response);
+					clearFields();
+				}
+				awaiting_ajax = false;
+			});
+		}else{
+			$("#debug").load("schoolstudents.php?action=new", params, function(response){
+				if(success){
+					$('#studentList > tbody:last').append(response);
+					clearFields();
+				}
+				awaiting_ajax = false;
+			});
+		}
 	}
 </script>
 <?php
@@ -193,11 +262,18 @@ function draw_list(){
 				<th></th>
 			</tr>
 			<tr>
-				<th><?=i18n("New:")?></th>
+				<th><span
+					onclick="clearFields();"
+					onmouseover="document.body.style.cursor='pointer';"
+					onmouseout="document.body.style.cursor='auto';">
+					<?=i18n("New:")?>
+					</span>
+					<input type="hidden" id="existingRecordId" value="-1"></input>
+				</th>
 				<th><input type="text" id="newFirstName"></input></th>
 				<th><input type="text" id="newLastName"></input></th>
 				<th><input type="text" id="newEmail"></input></th>
-				<th><button name="newRecord" onclick="addNewRecord()"><?=i18n("Add")?></button></th>
+				<th><button name="newRecord" onclick="saveRecord()"><?=i18n("Add")?></button></th>
 			</tr>
 		</thead>
 		<tbody>
@@ -207,6 +283,7 @@ function draw_list(){
 			$query .= ' JOIN users_conferences_link ucl ON ucl.users_uid = users_student.users_id';
 			$query .= ' WHERE schools_id = ' . $_SESSION['schoolid'];
 			$query .= ' AND ucl.conferences_id=' . $conference['id'];
+			$query .= ' AND users.deleted = "no"';
 			$data = mysql_query($query);
 			if($data){
 				while($row = mysql_fetch_array($data)){
@@ -214,7 +291,6 @@ function draw_list(){
 					echo user_row($uid, $row['username'], $row['firstname'], $row['lastname'], $row['email']);
 				}
 			}
-
 ?>
 		</tbody>
 	</table>