diff --git a/gw-toon.php b/gw-toon.php
index 624598c..dbb358d 100644
--- a/gw-toon.php
+++ b/gw-toon.php
@@ -10,44 +10,47 @@ $whattoon = mysqli_real_escape_string($con, $_POST['playerid']);
 if ($con->connect_errno > 0){
 	die ('Unable to connect to database [' . $db->connect_errno . ']');
 }
-if ($whattoon == "0" or $whattoon == ""){
-	$sql = "SELECT playerid, charname FROM `playername` WHERE `userid` = '$userid' ORDER BY `charname` ASC"; //need to make userid a variable
-	if (!$result = $con->query($sql)){
-		die ('There was an error running the query [' . $con->error . ']');
-	}
-	echo '<TITLE>Character Selection</TITLE></HEAD><BODY>';
-	echo '<CENTER><FORM METHOD="POST">';
-	echo '<SELECT NAME="playerid" onchange="this.form.submit()">';
-	echo '<OPTION SELECTED DISABLED>Select a Character</OPTION>';
-	while ($row = $result->fetch_array()){
-		$charid = $row['playerid'];
-		$charname = $row['charname'];
-		echo '<OPTION VALUE="' . $charid . '">' . $charname . '</OPTION>';
-	}
-	echo '</SELECT><NOSCRIPT><INPUT TYPE="SUBMIT" VALUE="Choose Toon"></NOSCRIPT></FORM><BR /><BR />';
-	echo '<FORM ACTION="gw-create.php"><INPUT TYPE="SUBMIT" VALUE="Add a toon"></FORM></CENTER>';
-} else {
-	$sqltoon = "SELECT charname from `playername` WHERE playerid = $whattoon";
-	if (!$result2 = $con->query($sqltoon)){
-		die ('There was an error running the query [' . $con->error . ']');
-	}
-	while ($row2 = $result2->fetch_array()){
-		$charactername = $row2['charname'];
-		echo '<TITLE>' . $charactername . '</TITLE><BODY>';
-	}
-	echo '<CENTER><FORM METHOD="POST" ACTION="gw-action.php">';
-	$_SESSION['playerid'] = $whattoon;
-	echo '<FIELDSET CLASS="radiogroup"><LEGEND>Select your course of action</LEGEND><UL CLASS="radio">';
-	echo '<LI style="text-align:left;"><INPUT TYPE="RADIO" NAME="gwaction" VALUE="1">Record loot info</LI>';
-	echo '<LI style="text-align:left;"><INPUT TYPE="RADIO" NAME="gwaction" VALUE="2">View Character loot history</LI>';
-	echo '</UL></FIELDSET>';
-	echo '<INPUT TYPE="SUBMIT" VALUE="Choose action"></FORM><BR /><BR /><FORM METHOD="POST" ACTION="gw-toon.php"><INPUT TYPE="HIDDEN" NAME="cnameid" VALUE="0"><INPUT TYPE="SUBMIT" VALUE="Return to character selection"></FORM></CENTER>';
-}
 if (!$_SESSION['userid']){
-	echo '<br>session is empty, put login code here<br>';
+	echo '<TITLE>Please login first</TITLE></HEAD><BODY>';
+	echo '<CENTER><FORM ACTION="gw-login.php" METHOD="POST">Username:<INPUT TYPE="TEXT" NAME="username" SIZE="20"><BR />';
+	echo 'Password:<INPUT TYPE="PASSWORD" NAME="password" SIZE="20"><BR />';
+	echo '<INPUT TYPE="SUBMIT" VALUE="Login ..."></FORM></CENTER>';
 } else {
-	echo '<BR /><BR /><CENTER><FORM METHOD="POST" ACTION="gw-logout.php"><INPUT TYPE="HIDDEN" NAME="logout"><INPUT TYPE="SUBMIT" VALUE="Logout"></FORM></CENTER>';
-}
+	if ($whattoon == "0" or $whattoon == ""){
+		$sql = "SELECT playerid, charname FROM `playername` WHERE `userid` = '$userid' ORDER BY `charname` ASC"; //need to make userid a variable
+		if (!$result = $con->query($sql)){
+			die ('There was an error running the query [' . $con->error . ']');
+		}
+		echo '<TITLE>Character Selection</TITLE></HEAD><BODY>';
+		echo '<CENTER><FORM METHOD="POST">';
+		echo '<SELECT NAME="playerid" onchange="this.form.submit()">';
+		echo '<OPTION SELECTED DISABLED>Select a Character</OPTION>';
+		while ($row = $result->fetch_array()){
+			$charid = $row['playerid'];
+			$charname = $row['charname'];
+			echo '<OPTION VALUE="' . $charid . '">' . $charname . '</OPTION>';
+		}
+		echo '</SELECT><NOSCRIPT><INPUT TYPE="SUBMIT" VALUE="Choose Toon"></NOSCRIPT></FORM><BR /><BR />';
+		echo '<FORM ACTION="gw-create.php"><INPUT TYPE="SUBMIT" VALUE="Add a toon"></FORM></CENTER>';
+		} else {
+			$sqltoon = "SELECT charname from `playername` WHERE playerid = $whattoon";
+			if (!$result2 = $con->query($sqltoon)){
+				die ('There was an error running the query [' . $con->error . ']');
+			}
+			while ($row2 = $result2->fetch_array()){
+				$charactername = $row2['charname'];
+				echo '<TITLE>' . $charactername . '</TITLE><BODY>';
+			}
+			echo '<CENTER><FORM METHOD="POST" ACTION="gw-action.php">';
+			$_SESSION['playerid'] = $whattoon;
+			echo '<FIELDSET CLASS="radiogroup"><LEGEND>Select your course of action</LEGEND><UL CLASS="radio">';
+			echo '<LI style="text-align:left;"><INPUT TYPE="RADIO" NAME="gwaction" VALUE="1">Record loot info</LI>';
+			echo '<LI style="text-align:left;"><INPUT TYPE="RADIO" NAME="gwaction" VALUE="2">View Character loot history</LI>';
+			echo '</UL></FIELDSET>';
+			echo '<INPUT TYPE="SUBMIT" VALUE="Choose action"></FORM><BR /><BR /><FORM METHOD="POST" ACTION="gw-toon.php"><INPUT TYPE="HIDDEN" NAME="cnameid" VALUE="0"><INPUT TYPE="SUBMIT" VALUE="Return to character selection"></FORM></CENTER>';
+		}
+		echo '<BR /><BR /><CENTER><FORM METHOD="POST" ACTION="gw-logout.php"><INPUT TYPE="HIDDEN" NAME="logout"><INPUT TYPE="SUBMIT" VALUE="Logout"></FORM></CENTER>';
+	}
 ?>
 </BODY>
 </HTML>
\ No newline at end of file
