diff --git a/gw-login.php b/gw-login.php
index 2376377..9e0f805 100644
--- a/gw-login.php
+++ b/gw-login.php
@@ -1,26 +1,28 @@
 <?php
 session_start();
-	include_once 'gw-connect.php';
-	$con = new mysqli(DATABASE_HOST, DATABASE_USER, DATABASE_PASS, DATABASE_NAME);
-	$username = mysqli_real_escape_string($con, $_POST['username']); //enable this after username form is built
-	$password = mysqli_real_escape_string($con, $_POST['password']); //enable this after password form is built
-	$password = md5($password);
-	if ($con->connect_errno > 0){
-		die ('Unable to connect to database [' . $db->connect_errno . ']');
+include_once 'gw-connect.php';
+$con = new mysqli(DATABASE_HOST, DATABASE_USER, DATABASE_PASS, DATABASE_NAME);
+$username = mysqli_real_escape_string($con, $_POST['username']); //enable this after username form is built
+$password = mysqli_real_escape_string($con, $_POST['password']); //enable this after password form is built
+$password = md5($password);
+if ($con->connect_errno > 0){
+	die ('Unable to connect to database [' . $db->connect_errno . ']');
+}
+$sqllogin = "SELECT * FROM users WHERE users.username = '$username' and password = '$password'";
+if ($result = $con->query($sqllogin)){
+	if ($result->fetchColumn() > 0){
+		while ($row = $result->fetch_array()){
+			$uname = $row['username'];
+			$uid = $row['userid'];
+			$access = $row['access'];
+			$_SESSION['username'] = $uname;
+			$_SESSION['userid'] = $uid;
+			$_SESSION['access'] = $access;
+			echo 'Your username is ' . $uname . '. Your userid is ' . $uid . '. Your access level is ' . $access . '.<BR />';
+		}
+	} else {
+		echo 'Login failed - please try again <A HREF="gw-index.php">here</A>';
 	}
-	$sqllogin = "SELECT * FROM users WHERE users.username = '$username' and password = '$password'";
-	if (!$result = $con->query($sqllogin)){
-		echo 'Invalid username or password';
-		die ('There was an error running the query [' . $con->error . ']');
-	}
-	while ($row = $result->fetch_array()){
-		$uname = $row['username'];
-		$uid = $row['userid'];
-		$access = $row['access'];
-		$_SESSION['username'] = $uname;
-		$_SESSION['userid'] = $uid;
-		$_SESSION['access'] = $access;
-		echo 'Your username is ' . $uname . '. Your userid is ' . $uid . '. Your access level is ' . $access . '.<BR />';
-	}
-	echo 'Proceed to character selection <A HREF="gw-toon.php">here</A><BR>'; //really should automate this
+}
+echo 'Proceed to character selection <A HREF="gw-toon.php">here</A><BR>'; //really should automate this
 ?>
\ No newline at end of file