diff --git a/ProgramFunctions/StudentsUsersInfo.fnc.php b/ProgramFunctions/StudentsUsersInfo.fnc.php
index ed5320077..b68ea58b4 100644
--- a/ProgramFunctions/StudentsUsersInfo.fnc.php
+++ b/ProgramFunctions/StudentsUsersInfo.fnc.php
@@ -55,7 +55,7 @@ function _makeTextInput( $column, $name, $request )
 	$options .= $field['REQUIRED'] === 'Y' ? ' required' : '';
 
 	return TextInput(
-		$value[ $column ],
+		issetVal( $value[ $column ], '' ),
 		$request . '[' . $column . ']',
 		$name,
 		$options,
@@ -102,7 +102,7 @@ function _makeDateInput( $column, $name, $request )
 	}
 
 	return DateInput(
-		$value[ $column ],
+		issetVal( $value[ $column ], '' ),
 		$request . '[' . $column . ']',
 		$name,
 		$div,
@@ -165,7 +165,7 @@ function _makeSelectInput( $column, $name, $request )
 	$extra = ( $field['REQUIRED'] === 'Y' ? 'required': '' );
 
 	return SelectInput(
-		$value[ $column ],
+		issetVal( $value[ $column ], '' ),
 		$request . '[' . $column . ']',
 		$name,
 		$options,
diff --git a/functions/ErrorMessage.fnc.php b/functions/ErrorMessage.fnc.php
index 1330d413b..eb8da80d9 100644
--- a/functions/ErrorMessage.fnc.php
+++ b/functions/ErrorMessage.fnc.php
@@ -65,7 +65,8 @@ function ErrorMessage( $errors, $code = 'error' )
 
 	if ( count( $errors ) === 1 )
 	{
-		$return .= ': ' . issetVal( $errors[0], $errors[1] ) . '</p>';
+		// Note: do not use issetVal() here.
+		$return .= ': ' . ( isset( $errors[0] ) ? $errors[0] : $errors[1] ) . '</p>';
 	}
 
 	// More than one error: list.
diff --git a/functions/GetGrade.fnc.php b/functions/GetGrade.fnc.php
index 0c5584c3c..6a09ebe52 100644
--- a/functions/GetGrade.fnc.php
+++ b/functions/GetGrade.fnc.php
@@ -32,6 +32,11 @@ function GetGrade( $grade, $column = 'TITLE' )
 			FROM SCHOOL_GRADELEVELS", array(), array( 'ID' ) );
 	}
 
+	if ( ! isset( $grades[ $grade ] ) )
+	{
+		return '';
+	}
+
 	$extra = '';
 
 	if ( $column === 'TITLE' )
diff --git a/functions/GetStaffList.fnc.php b/functions/GetStaffList.fnc.php
index beed0c289..1f3749ba5 100644
--- a/functions/GetStaffList.fnc.php
+++ b/functions/GetStaffList.fnc.php
@@ -317,7 +317,7 @@ function appendStaffSQL( $sql, $extra = array() )
 			);
 		}
 
-		if ( $extra['profile'] )
+		if ( ! empty( $extra['profile'] ) )
 		{
 			$options = array( $extra['profile'] => $options[ $extra['profile'] ] );
 		}
diff --git a/functions/ListOutput.fnc.php b/functions/ListOutput.fnc.php
index eac4c2c9c..5706327d1 100644
--- a/functions/ListOutput.fnc.php
+++ b/functions/ListOutput.fnc.php
@@ -818,7 +818,7 @@ class="button" alt="" title="' . htmlspecialchars( _( 'Search' ), ENT_QUOTES ) .
 
 				foreach ( (array) $column_names as $key => $value )
 				{
-					echo '<td>' . $link['add']['html'][$key] . '</td>';
+					echo '<td>' . issetVal( $link['add']['html'][$key], '' ) . '</td>';
 				}
 
 				echo '</tr></tbody>';
diff --git a/index.php b/index.php
index 6a774d841..d15607fbe 100644
--- a/index.php
+++ b/index.php
@@ -289,6 +289,13 @@
 	}
 	else
 	{
+		if ( ! isset( $_REQUEST['modfunc'] ) )
+		{
+			$_REQUEST['modfunc'] = false;
+		}
+
+		$_REQUEST['modname'] = false;
+
 		$_ROSARIO['page'] = 'create-account';
 
 		Warehouse( 'header' );
@@ -440,7 +447,10 @@
 	<?php endif; ?>
 	</form>
 	<input class="toggle" type="checkbox" id="toggle1" />
-	<label class="toggle" for="toggle1"><?php echo _( 'About' ); ?></label>
+	<label class="toggle" for="toggle1"><?php
+	// @todo Use <detail><summary> & remove CSS hack.
+	// @link https://caniuse.com/#search=details
+	echo _( 'About' ); ?></label>
 	<div class="about-rosariosis toggle-me">
 		<?php // System disclaimer. ?>
 		<p class="size-3">
diff --git a/modules/Grades/Assignments.php b/modules/Grades/Assignments.php
index 64aef52c6..bc07ac0a4 100644
--- a/modules/Grades/Assignments.php
+++ b/modules/Grades/Assignments.php
@@ -385,7 +385,7 @@
 {
 	$hide_previous_assignment_types_sql = '';
 
-	if ( $gradebook_config['HIDE_PREVIOUS_ASSIGNMENT_TYPES'] )
+	if ( ! empty( $gradebook_config['HIDE_PREVIOUS_ASSIGNMENT_TYPES'] ) )
 	{
 		// @since 4.5 Hide previous quarters assignment types.
 		$hide_previous_assignment_types_sql = " AND CREATED_MP='" . UserMP() . "' OR CREATED_MP IS NULL";
diff --git a/modules/Grades/Grades.php b/modules/Grades/Grades.php
index 972a6b218..4a73fd8ef 100644
--- a/modules/Grades/Grades.php
+++ b/modules/Grades/Grades.php
@@ -32,7 +32,9 @@
 $gradebook_config = ProgramUserConfig( 'Gradebook' );
 
 //$max_allowed = Preferences('ANOMALOUS_MAX','Gradebook')/100;
-$max_allowed = ( $gradebook_config['ANOMALOUS_MAX'] ? $gradebook_config['ANOMALOUS_MAX'] / 100 : 1 );
+$max_allowed = ( isset( $gradebook_config['ANOMALOUS_MAX'] ) && $gradebook_config['ANOMALOUS_MAX'] ?
+	$gradebook_config['ANOMALOUS_MAX'] / 100 :
+	1 );
 
 if ( ! empty( $_REQUEST['student_id'] ) )
 {
@@ -225,7 +227,7 @@
 
 			$sql = '';
 
-			if ( $current_RET[$student_id][$assignment_id] )
+			if ( ! empty( $current_RET[$student_id][$assignment_id] ) )
 			{
 				$sql = "UPDATE GRADEBOOK_GRADES SET ";
 
@@ -290,7 +292,7 @@
 
 	if ( ProgramConfig( 'grades', 'GRADES_DOES_LETTER_PERCENT' ) <= 0 )
 	{
-		if ( $gradebook_config['LETTER_GRADE_ALL'] != 'Y' )
+		if ( empty( $gradebook_config['LETTER_GRADE_ALL'] ) )
 		{
 			$LO_columns['LETTER_GRADE'] = _( 'Letter' );
 		}
@@ -474,7 +476,7 @@
 		if ( ProgramConfig( 'grades', 'GRADES_DOES_LETTER_PERCENT' ) <= 0 )
 		{
 			if ( empty( $_REQUEST['assignment_id'] )
-				|| $gradebook_config['LETTER_GRADE_ALL'] != 'Y' )
+				|| empty( $gradebook_config['LETTER_GRADE_ALL'] ) )
 			{
 				$LO_columns['LETTER_GRADE'] = _( 'Letter' );
 			}
@@ -579,8 +581,14 @@
 	}
 
 	$tabs[] = array(
-		'title' => $color . $type[1]['TITLE'] . ( $gradebook_config['WEIGHT'] == 'Y' ? '|' . number_format( 100 * $type[1]['FINAL_GRADE_PERCENT'], 0 ) . '%' : '' ),
-		'link' => 'Modules.php?modname=' . $_REQUEST['modname'] . '&type_id=' . $id . ( $_REQUEST['assignment_id'] == 'all' ? '&assignment_id=all' : '' ) . ( UserStudentID() ? '&student_id=' . UserStudentID() : '' ) . '&include_inactive=' . $_REQUEST['include_inactive'] . '&include_all=' . $_REQUEST['include_all'],
+		'title' => $color . $type[1]['TITLE'] .
+			( isset( $gradebook_config['WEIGHT'] ) && $gradebook_config['WEIGHT'] == 'Y' ?
+				'|' . number_format( 100 * $type[1]['FINAL_GRADE_PERCENT'], 0 ) . '%' :
+				'' ),
+		'link' => 'Modules.php?modname=' . $_REQUEST['modname'] . '&type_id=' . $id .
+			( $_REQUEST['assignment_id'] == 'all' ? '&assignment_id=all' : '' ) .
+			( UserStudentID() ? '&student_id=' . UserStudentID() : '' ) .
+			'&include_inactive=' . $_REQUEST['include_inactive'] . '&include_all=' . $_REQUEST['include_all'],
 	);
 }
 
@@ -746,7 +754,8 @@ function _makeExtraAssnCols( $assignment_id, $column )
 			else
 			{
 				if ( ! empty( $_REQUEST['include_all'] )
-					|| ( $current_RET[$THIS_RET['STUDENT_ID']][$assignment_id][1]['POINTS'] != ''
+					|| ( ( isset( $current_RET[$THIS_RET['STUDENT_ID']][$assignment_id][1]['POINTS'] )
+						&& $current_RET[$THIS_RET['STUDENT_ID']][$assignment_id][1]['POINTS'] != '' )
 						|| ! $assignments_RET[$assignment_id][1]['DUE_EPOCH']
 						|| $assignments_RET[$assignment_id][1]['DUE_EPOCH'] >= $THIS_RET['START_EPOCH']
 						&& ( ! $THIS_RET['END_EPOCH']
@@ -755,7 +764,7 @@ function _makeExtraAssnCols( $assignment_id, $column )
 					$total_points = $assignments_RET[$assignment_id][1]['POINTS'];
 
 					//FJ default points
-					$points = $current_RET[$THIS_RET['STUDENT_ID']][$assignment_id][1]['POINTS'];
+					$points = issetVal( $current_RET[$THIS_RET['STUDENT_ID']][$assignment_id][1]['POINTS'] );
 					$div = true;
 
 					if ( is_null( $points ) )
@@ -804,8 +813,14 @@ function _makeExtraAssnCols( $assignment_id, $column )
 					{
 						if ( $partial_points['PARTIAL_TOTAL'] != 0 || $gradebook_config['WEIGHT'] != 'Y' )
 						{
-							$total += $partial_points['PARTIAL_POINTS'] * ( $gradebook_config['WEIGHT'] == 'Y' ? $partial_points['FINAL_GRADE_PERCENT'] / $partial_points['PARTIAL_TOTAL'] : 1 );
-							$total_percent += ( $gradebook_config['WEIGHT'] == 'Y' ? $partial_points['FINAL_GRADE_PERCENT'] : $partial_points['PARTIAL_TOTAL'] );
+							$total += $partial_points['PARTIAL_POINTS'] *
+								( isset( $gradebook_config['WEIGHT'] ) && $gradebook_config['WEIGHT'] == 'Y' ?
+									$partial_points['FINAL_GRADE_PERCENT'] / $partial_points['PARTIAL_TOTAL'] :
+									1 );
+
+							$total_percent += ( isset( $gradebook_config['WEIGHT'] ) && $gradebook_config['WEIGHT'] == 'Y' ?
+								$partial_points['FINAL_GRADE_PERCENT'] :
+								$partial_points['PARTIAL_TOTAL'] );
 						}
 					}
 
@@ -912,7 +927,7 @@ function _makeExtraAssnCols( $assignment_id, $column )
 							|| $assignments_RET[$assignment_id][1]['DUE_EPOCH'] <= $THIS_RET['END_EPOCH'] ) ) )
 				{
 					return TextInput(
-						$current_RET[$THIS_RET['STUDENT_ID']][$assignment_id][1]['COMMENT'],
+						issetVal( $current_RET[$THIS_RET['STUDENT_ID']][$assignment_id][1]['COMMENT'] ),
 						'values[' . $THIS_RET['STUDENT_ID'] . '][' . $assignment_id . '][COMMENT]',
 						'',
 						' maxlength=100'
diff --git a/modules/Students/Student.php b/modules/Students/Student.php
index 0025642eb..1008fcc27 100644
--- a/modules/Students/Student.php
+++ b/modules/Students/Student.php
@@ -152,19 +152,22 @@
 			$error[] = _( 'Please fill in the required fields' );
 		}
 
-		// Check username unicity.
-		$existing_username = DBGet( "SELECT 'exists'
-			FROM STAFF
-			WHERE USERNAME='" . $_REQUEST['students']['USERNAME'] . "'
-			AND SYEAR='" . UserSyear() . "'
-			UNION SELECT 'exists'
-			FROM STUDENTS
-			WHERE USERNAME='" . $_REQUEST['students']['USERNAME'] . "'
-			AND STUDENT_ID!='" . UserStudentID() . "'" );
-
-		if ( ! empty( $existing_username ) )
+		if ( isset( $_REQUEST['students']['USERNAME'] ) )
 		{
-			$error[] = _( 'A user with that username already exists. Choose a different username and try again.' );
+			// Check username unicity.
+			$existing_username = DBGet( "SELECT 'exists'
+				FROM STAFF
+				WHERE USERNAME='" . $_REQUEST['students']['USERNAME'] . "'
+				AND SYEAR='" . UserSyear() . "'
+				UNION SELECT 'exists'
+				FROM STUDENTS
+				WHERE USERNAME='" . $_REQUEST['students']['USERNAME'] . "'
+				AND STUDENT_ID!='" . UserStudentID() . "'" );
+
+			if ( ! empty( $existing_username ) )
+			{
+				$error[] = _( 'A user with that username already exists. Choose a different username and try again.' );
+			}
 		}
 
 		if ( UserStudentID() && ! $error )
@@ -183,60 +186,62 @@
 			if ( ! empty( $_REQUEST['students'] ) && ! $error )
 			{
 				$sql = "UPDATE STUDENTS SET ";
-				$fields_RET = DBGet( "SELECT ID,TYPE FROM CUSTOM_FIELDS ORDER BY SORT_ORDER", array(), array( 'ID' ) );
+
+				$fields_RET = DBGet( "SELECT ID,TYPE
+					FROM CUSTOM_FIELDS
+					ORDER BY SORT_ORDER", array(), array( 'ID' ) );
+
 				$go = false;
 
 				foreach ( (array) $_REQUEST['students'] as $column => $value )
 				{
-					if ( 1 ) //!empty($value) || $value=='0')
+					if ( isset( $fields_RET[str_replace( 'CUSTOM_', '', $column )][1]['TYPE'] )
+						&& $fields_RET[str_replace( 'CUSTOM_', '', $column )][1]['TYPE'] == 'numeric'
+						&& $value != ''
+						&& ! is_numeric( $value ) )
 					{
-						//FJ check numeric fields
+						$error[] = _( 'Please enter valid Numeric data.' );
+						continue;
+					}
 
-						if ( $fields_RET[str_replace( 'CUSTOM_', '', $column )][1]['TYPE'] == 'numeric' && $value != '' && ! is_numeric( $value ) )
+					if ( ! is_array( $value ) )
+					{
+						//FJ add password encryption
+
+						if ( $column !== 'PASSWORD' )
 						{
-							$error[] = _( 'Please enter valid Numeric data.' );
-							continue;
+							$sql .= $column . "='" . str_replace( '&#39;', "''", $value ) . "',";
+							$go = true;
 						}
 
-						if ( ! is_array( $value ) )
+						if ( $column == 'PASSWORD' && ! empty( $value ) && $value !== str_repeat( '*', 8 ) )
 						{
-							//FJ add password encryption
-
-							if ( $column !== 'PASSWORD' )
-							{
-								$sql .= $column . "='" . str_replace( '&#39;', "''", $value ) . "',";
-								$go = true;
-							}
-
-							if ( $column == 'PASSWORD' && ! empty( $value ) && $value !== str_repeat( '*', 8 ) )
-							{
-								$value = str_replace( "''", "'", $value );
-								$sql .= $column . "='" . encrypt_password( $value ) . "',";
-								$go = true;
-							}
+							$value = str_replace( "''", "'", $value );
+							$sql .= $column . "='" . encrypt_password( $value ) . "',";
+							$go = true;
 						}
-						else
-						{
-							// FJ fix bug none selected not saved.
-							$sql_multiple_input = '';
+					}
+					else
+					{
+						// FJ fix bug none selected not saved.
+						$sql_multiple_input = '';
 
-							foreach ( (array) $value as $val )
+						foreach ( (array) $value as $val )
+						{
+							if ( $val )
 							{
-								if ( $val )
-								{
-									$sql_multiple_input .= $val . '||';
-								}
+								$sql_multiple_input .= $val . '||';
 							}
+						}
 
-							if ( $sql_multiple_input )
-							{
-								$sql_multiple_input = "||" . $sql_multiple_input;
-							}
+						if ( $sql_multiple_input )
+						{
+							$sql_multiple_input = "||" . $sql_multiple_input;
+						}
 
-							$sql .= $column . "='" . $sql_multiple_input . "',";
+						$sql .= $column . "='" . $sql_multiple_input . "',";
 
-							$go = true;
-						}
+						$go = true;
 					}
 				}
 
@@ -687,10 +692,7 @@
 		echo '<form name="student" id="student"	action="' . $form_action . '"
 			method="POST" enctype="multipart/form-data">';
 
-		if ( $_REQUEST['student_id'] !== 'new' )
-		{
-			$name = $student['FULL_NAME'] . ' - ' . $student['STUDENT_ID'];
-		}
+		$name = $_REQUEST['student_id'] !== 'new' ? $student['FULL_NAME'] . ' - ' . $student['STUDENT_ID'] : '';
 
 		DrawHeader( $name, $delete_button . SubmitButton() );
 
diff --git a/modules/Students/includes/General_Info.inc.php b/modules/Students/includes/General_Info.inc.php
index 3fa2dfaa3..f8d848cc1 100644
--- a/modules/Students/includes/General_Info.inc.php
+++ b/modules/Students/includes/General_Info.inc.php
@@ -31,30 +31,30 @@
 {
 	$div = false;
 
-	$student_name_html = '<table><tr class="st"><td>' .
+	$student_name_html = '<table class="cellspacing-0"><tr class="st"><td>' .
 	TextInput(
-		$student['FIRST_NAME'],
+		issetVal( $student['FIRST_NAME'], '' ),
 		'students[FIRST_NAME]',
 		_( 'First Name' ),
 		'size=12 maxlength=50 required',
 		$div
 	) . '</td><td>' .
 	TextInput(
-		$student['MIDDLE_NAME'],
+		issetVal( $student['MIDDLE_NAME'], '' ),
 		'students[MIDDLE_NAME]',
 		_( 'Middle Name' ),
 		'maxlength=50',
 		$div
 	) . '</td><td>' .
 	TextInput(
-		$student['LAST_NAME'],
+		issetVal( $student['LAST_NAME'], '' ),
 		'students[LAST_NAME]',
 		_( 'Last Name' ),
 		'size=12 maxlength=50 required',
 		$div
 	) . '</td><td>' .
 	SelectInput(
-		$student['NAME_SUFFIX'],
+		issetVal( $student['NAME_SUFFIX'], '' ),
 		'students[NAME_SUFFIX]',
 		_( 'Suffix' ),
 		array(
@@ -112,7 +112,7 @@
 
 echo '</td><td>';
 
-echo NoInput( makeLogin( $student['LAST_LOGIN'] ), _( 'Last Login' ) );
+echo NoInput( makeLogin( issetVal( $student['LAST_LOGIN'], '' ) ), _( 'Last Login' ) );
 
 echo '</td></tr><tr class="st"><td>';
 //FJ Moodle integrator
@@ -121,7 +121,7 @@
 $required = ! empty( $_REQUEST['moodle_create_student'] ) || ! empty( $old_student_in_moodle ) || basename( $_SERVER['PHP_SELF'] ) == 'index.php';
 
 echo TextInput(
-	$student['USERNAME'],
+	issetVal( $student['USERNAME'], '' ),
 	'students[USERNAME]',
 	_( 'Username' ),
 	( $required ? 'required ' : '' ) .
@@ -134,7 +134,7 @@
 echo '</td><td>';
 
 echo PasswordInput(
-	( ! $student['PASSWORD']
+	( empty( $student['PASSWORD'] )
 		|| ! empty( $_REQUEST['moodle_create_student'] ) ? '' : str_repeat( '*', 8 ) ),
 	'students[PASSWORD]',
 	_( 'Password' ) .
diff --git a/modules/Students/includes/SaveEnrollment.fnc.php b/modules/Students/includes/SaveEnrollment.fnc.php
index c0493be66..548eeaa32 100644
--- a/modules/Students/includes/SaveEnrollment.fnc.php
+++ b/modules/Students/includes/SaveEnrollment.fnc.php
@@ -22,7 +22,7 @@ function SaveEnrollment()
 				unset( $_REQUEST['month_values']['STUDENT_ENROLLMENT'][$stu_enrol_id] );
 				unset( $_REQUEST['year_values']['STUDENT_ENROLLMENT'][$stu_enrol_id] );
 			}
-			elseif ( UserStudentID() && $stu_enrol_month['START_DATE'] )
+			elseif ( UserStudentID() && ! empty( $stu_enrol_month['START_DATE'] ) )
 			{
 				$date = RequestedDate(
 					$_REQUEST['year_values']['STUDENT_ENROLLMENT'][$stu_enrol_id]['START_DATE'],
diff --git a/modules/Users/User.php b/modules/Users/User.php
index b400a531e..e22f0c4d4 100644
--- a/modules/Users/User.php
+++ b/modules/Users/User.php
@@ -209,19 +209,22 @@
 			$error[] = _( 'Please fill in the required fields' );
 		}
 
-		//check username unicity
-		$existing_username = DBGet( "SELECT 'exists'
-			FROM STAFF
-			WHERE USERNAME='" . $_REQUEST['staff']['USERNAME'] . "'
-			AND SYEAR='" . UserSyear() . "'
-			AND STAFF_ID!='" . UserStaffID() . "'
-			UNION SELECT 'exists'
-			FROM STUDENTS
-			WHERE USERNAME='" . $_REQUEST['staff']['USERNAME'] . "'" );
-
-		if ( ! empty( $existing_username ) )
+		if ( isset( $_REQUEST['staff']['USERNAME'] ) )
 		{
-			$error[] = _( 'A user with that username already exists. Choose a different username and try again.' );
+			//check username unicity
+			$existing_username = DBGet( "SELECT 'exists'
+				FROM STAFF
+				WHERE USERNAME='" . $_REQUEST['staff']['USERNAME'] . "'
+				AND SYEAR='" . UserSyear() . "'
+				AND STAFF_ID!='" . UserStaffID() . "'
+				UNION SELECT 'exists'
+				FROM STUDENTS
+				WHERE USERNAME='" . $_REQUEST['staff']['USERNAME'] . "'" );
+
+			if ( ! empty( $existing_username ) )
+			{
+				$error[] = _( 'A user with that username already exists. Choose a different username and try again.' );
+			}
 		}
 
 		if ( UserStaffID() && ! $error )
@@ -254,22 +257,31 @@
 			elseif ( isset( $_REQUEST['staff']['PROFILE_ID'] ) && $profile_RET[1]['PROFILE_ID'] )
 			{
 				DBQuery( "DELETE FROM STAFF_EXCEPTIONS WHERE USER_ID='" . UserStaffID() . "'" );
-				DBQuery( "INSERT INTO STAFF_EXCEPTIONS (USER_ID,MODNAME,CAN_USE,CAN_EDIT) SELECT s.STAFF_ID,e.MODNAME,e.CAN_USE,e.CAN_EDIT FROM STAFF s,PROFILE_EXCEPTIONS e WHERE s.STAFF_ID='" . UserStaffID() . "' AND s.PROFILE_ID=e.PROFILE_ID" );
+				DBQuery( "INSERT INTO STAFF_EXCEPTIONS (USER_ID,MODNAME,CAN_USE,CAN_EDIT)
+					SELECT s.STAFF_ID,e.MODNAME,e.CAN_USE,e.CAN_EDIT
+					FROM STAFF s,PROFILE_EXCEPTIONS e
+					WHERE s.STAFF_ID='" . UserStaffID() . "'
+					AND s.PROFILE_ID=e.PROFILE_ID" );
 			}
 
 			if ( ! $error )
 			{
 				$sql = "UPDATE STAFF SET ";
-				$fields_RET = DBGet( "SELECT ID,TYPE FROM STAFF_FIELDS ORDER BY SORT_ORDER", array(), array( 'ID' ) );
+
+				$fields_RET = DBGet( "SELECT ID,TYPE
+					FROM STAFF_FIELDS
+					ORDER BY SORT_ORDER", array(), array( 'ID' ) );
+
 				$go = false;
 
 				foreach ( (array) $_REQUEST['staff'] as $column_name => $value )
 				{
 					if ( ! is_array( $value ) )
 					{
-						//FJ check numeric fields
-
-						if ( $fields_RET[str_replace( 'CUSTOM_', '', $column_name )][1]['TYPE'] == 'numeric' && $value != '' && ! is_numeric( $value ) )
+						if ( isset( $fields_RET[str_replace( 'CUSTOM_', '', $column_name )][1]['TYPE'] )
+							&& $fields_RET[str_replace( 'CUSTOM_', '', $column_name )][1]['TYPE'] == 'numeric'
+							&& $value != ''
+							&& ! is_numeric( $value ) )
 						{
 							$error[] = _( 'Please enter valid Numeric data.' );
 							continue;
@@ -632,10 +644,7 @@
 		}
 	}
 
-	if ( $_REQUEST['staff_id'] !== 'new' )
-	{
-		$name = $staff['FULL_NAME'] . ' - ' . $staff['STAFF_ID'];
-	}
+	$name = $_REQUEST['staff_id'] !== 'new' ? $staff['FULL_NAME'] . ' - ' . $staff['STAFF_ID'] : '';
 
 	DrawHeader( $name, $delete_button . SubmitButton() );
 
diff --git a/modules/Users/includes/General_Info.inc.php b/modules/Users/includes/General_Info.inc.php
index 9a71bdb58..475d699f3 100644
--- a/modules/Users/includes/General_Info.inc.php
+++ b/modules/Users/includes/General_Info.inc.php
@@ -44,16 +44,19 @@
 	'V' => _( 'V' ),
 );
 
-$staff_title = issetVal( $titles_array[ $staff['TITLE'] ], '' );
-$staff_suffix = issetVal( $suffixes_array[ $staff['NAME_SUFFIX'] ], '' );
+$staff_title = isset( $staff['TITLE'] ) && isset( $titles_array[ $staff['TITLE'] ] ) ?
+	$titles_array[ $staff['TITLE'] ] : '';
+
+$staff_suffix = isset( $staff['NAME_SUFFIX'] ) && isset( $suffixes_array[ $staff['NAME_SUFFIX'] ] ) ?
+	$suffixes_array[ $staff['NAME_SUFFIX'] ] : '';
 
 if ( AllowEdit() && ! isset( $_REQUEST['_ROSARIO_PDF'] ) )
 {
 	$div = false;
 
-	$user_name_html = '<table><tr class="st"><td>' .
+	$user_name_html = '<table class="cellspacing-0"><tr class="st"><td>' .
 	SelectInput(
-		$staff['TITLE'],
+		issetVal( $staff['TITLE'], '' ),
 		'staff[TITLE]',
 		_( 'Title' ),
 		$titles_array,
@@ -62,28 +65,28 @@
 		$div
 	) . '</td><td>' .
 	TextInput(
-		$staff['FIRST_NAME'],
+		issetVal( $staff['FIRST_NAME'], '' ),
 		'staff[FIRST_NAME]',
 		_( 'First Name' ),
 		'maxlength=50 required',
 		$div
 	) . '</td><td>' .
 	TextInput(
-		$staff['MIDDLE_NAME'],
+		issetVal( $staff['MIDDLE_NAME'], '' ),
 		'staff[MIDDLE_NAME]',
 		_( 'Middle Name' ),
 		'maxlength=50',
 		$div
 	) . '</td><td>' .
 	TextInput(
-		$staff['LAST_NAME'],
+		issetVal( $staff['LAST_NAME'], '' ),
 		'staff[LAST_NAME]',
 		_( 'Last Name' ),
 		'maxlength=50 required',
 		$div
 	) . '</td><td>' .
 	SelectInput(
-		$staff['NAME_SUFFIX'],
+		issetVal( $staff['NAME_SUFFIX'], '' ),
 		'staff[NAME_SUFFIX]',
 		_( 'Suffix' ),
 		$suffixes_array,
@@ -143,7 +146,7 @@
 $required = ! empty( $_REQUEST['moodle_create_user'] ) || ! empty( $old_user_in_moodle ) || basename( $_SERVER['PHP_SELF'] ) == 'index.php';
 
 echo TextInput(
-	$staff['USERNAME'],
+	issetVal( $staff['USERNAME'], '' ),
 	'staff[USERNAME]',
 	_( 'Username' ),
 	'size=12 maxlength=100 ' . ( $required ? 'required' : '' ),
@@ -153,7 +156,7 @@
 echo '</td><td>';
 
 echo PasswordInput(
-	( ! $staff['PASSWORD'] || ! empty( $_REQUEST['moodle_create_user'] ) ? '' : str_repeat( '*', 8 ) ),
+	( empty( $staff['PASSWORD'] ) || ! empty( $_REQUEST['moodle_create_user'] ) ? '' : str_repeat( '*', 8 ) ),
 	'staff[PASSWORD]',
 	_( 'Password' ) .
 	( ! empty( $_REQUEST['moodle_create_user'] ) || ! empty( $old_user_in_moodle ) ?
@@ -168,7 +171,7 @@
 
 echo '</td></tr><tr class="st"><td colspan="2">';
 
-echo NoInput( makeLogin( $staff['LAST_LOGIN'] ), _( 'Last Login' ) );
+echo NoInput( makeLogin( issetVal( $staff['LAST_LOGIN'], '' ) ), _( 'Last Login' ) );
 
 echo '</td></tr></table><hr />';
 
@@ -212,7 +215,7 @@
 	}
 
 	echo SelectInput(
-		$staff['PROFILE'],
+		issetVal( $staff['PROFILE'], '' ),
 		'staff[PROFILE]',
 		_( 'User Profile' ),
 		$profile_options,
@@ -245,7 +248,7 @@
 	}
 
 	echo SelectInput(
-		$staff['PROFILE_ID'],
+		issetVal( $staff['PROFILE_ID'], '' ),
 		'staff[PROFILE_ID]',
 		_( 'Permissions' ),
 		$permissions_options,
@@ -313,7 +316,8 @@
 					$schools_html .= '</tr><tr class="st">';
 				}
 
-				$value = mb_strpos( $staff['SCHOOLS'], ',' . $school['ID'] . ',' ) !== false ? 'Y' : '';
+				$value = isset( $staff['SCHOOLS'] )
+					&& mb_strpos( $staff['SCHOOLS'], ',' . $school['ID'] . ',' ) !== false ? 'Y' : '';
 
 				$schools_html .= '<td>' . CheckboxInput(
 					$value,
@@ -386,7 +390,7 @@
 // FJ Moodle integrator: email required
 //echo TextInput($staff['EMAIL'],'staff[EMAIL]',_('Email Address'),'size=12 maxlength=100');
 echo TextInput(
-	$staff['EMAIL'],
+	issetVal( $staff['EMAIL'], '' ),
 	'staff[EMAIL]',
 	_( 'Email Address' ),
 	'type="email" pattern="[^ @]*@[^ @]*" size=12 maxlength=100' .
@@ -406,7 +410,7 @@
 }
 
 echo TextInput(
-	$staff['PHONE'],
+	issetVal( $staff['PHONE'], '' ),
 	'staff[PHONE]',
 	_( 'Phone Number' ),
 	'size=12 maxlength=100'