diff --git a/login.php b/login.php
index dbc4f9e..685a6c3 100644
--- a/login.php
+++ b/login.php
@@ -22,7 +22,7 @@
 		$errors = array();
 		$username = trim($_POST["username"]);
 		$password = trim($_POST["password"]);
-		$remember_choice = trim($_POST["remember_me"]);
+		$remember_choice = !empty( $_POST["remember_me"] ) ? trim( $_POST["remember_me"] ) : 0;
 	
 		//Perform some validation
 		//Feel free to edit / change as required
@@ -74,18 +74,18 @@
 						$loggedInUser->hash_pw = $userdetails["password"];
 						$loggedInUser->display_username = $userdetails["username"];
 						$loggedInUser->clean_username = $userdetails["username_clean"];
-$loggedInUser->remember_me = $remember_choice;
-$loggedInUser->remember_me_sessid = generateHash(uniqid(rand(), true));
+						$loggedInUser->remember_me = $remember_choice;
+						$loggedInUser->remember_me_sessid = generateHash(uniqid(rand(), true));
 						
 						//Update last sign in
 						$loggedInUser->updatelast_sign_in();
 		
-						if($loggedInUser->remember_me == 0)
-$_SESSION["userPieUser"] = $loggedInUser;
-else if($loggedInUser->remember_me == 1) {
-$db->sql_query("INSERT INTO ".$db_table_prefix."sessions VALUES('".time()."', '".serialize($loggedInUser)."', '".$loggedInUser->remember_me_sessid."')");
-setcookie("userPieUser", $loggedInUser->remember_me_sessid, time()+parseLength($remember_me_length));
-}
+						if($loggedInUser->remember_me == 0) {
+							$_SESSION["userPieUser"] = $loggedInUser;
+						} else if($loggedInUser->remember_me == 1) {
+							$db->sql_query("INSERT INTO ".$db_table_prefix."sessions VALUES('".time()."', '".serialize($loggedInUser)."', '".$loggedInUser->remember_me_sessid."')");
+							setcookie("userPieUser", $loggedInUser->remember_me_sessid, time()+parseLength($remember_me_length));
+						}
 						
 						//Redirect to user account page
 						header("Location: index.php");
@@ -128,12 +128,12 @@
         } }
         ?> 
         
-        <?php if(($_GET['status']) == "success") 
-        {
-        
-        echo "<p>Your account was created successfully. Please login.</p>";
+        <?php 
         
-    	}
+        if( !empty( $_GET['status'] ) && ( $_GET['status'] ) == "success" ) {
+	        echo "<p>Your account was created successfully. Please login.</p>";
+    	} 
+    	
     	?>
         
         
diff --git a/models/class.mail.php b/models/class.mail.php
index 191e188..47dae2a 100644
--- a/models/class.mail.php
+++ b/models/class.mail.php
@@ -72,7 +72,11 @@ public function sendMail($email,$subject,$msg = NULL)
 		if($msg == NULL)
 			$msg = $this->contents; 
 
-		$message .= $msg;
+		if( !empty( $message ) ) {
+			$message .= $msg;
+		} else {
+			$message = $msg;
+		}
 
 		$message = wordwrap($message, 70);
 			
diff --git a/models/funcs.user.php b/models/funcs.user.php
index b0c3022..60b0fa8 100644
--- a/models/funcs.user.php
+++ b/models/funcs.user.php
@@ -163,6 +163,11 @@ function isUserLoggedIn()
 	{
 		global $loggedInUser,$db,$db_table_prefix;
 		
+		// ensure loggedInUser is not null before attempting to use it
+		if( empty( $loggedInUser ) ) {
+			return false;
+		}
+		
 		$sql = "SELECT user_id,
 				password
 				FROM ".$db_table_prefix."users
diff --git a/register.php b/register.php
index d977619..cdd7389 100644
--- a/register.php
+++ b/register.php
@@ -100,11 +100,15 @@
 			
 
 
-        <div id="success">
-        
-           <p><?php echo $message ?></p>
-           
-        </div>
+        <div id="success"> <?php
+			if( !empty( $_POST ) ) {
+				if( count( $errors ) > 0 ) {
+					errorBlock( $errors );
+				} else {
+					echo '<p>' . $message . '</p>';
+				}
+			} ?>          
+		</div>
 
             <div id="regbox">
                 <form name="newUser" action="<?php echo $_SERVER['PHP_SELF'] ?>" method="post">