diff --git a/app/class/UserManager.php b/app/class/UserManager.php
index 1d19cfd..c3b7864 100644
--- a/app/class/UserManager.php
+++ b/app/class/UserManager.php
@@ -3,7 +3,7 @@ class UserManager
 {
 	public function getUsers () {
 		try {
-			$allUsers = Db::loadAll ("SELECT user_id, username FROM users");
+			$allUsers = Db::loadAll ("SELECT user_id, username, at_home FROM users");
 			return $allUsers;
 		} catch(PDOException $error) {
 			echo $error->getMessage();
diff --git a/app/views/Home.php b/app/views/Home.php
index 0f2cb2a..e3f068a 100644
--- a/app/views/Home.php
+++ b/app/views/Home.php
@@ -22,10 +22,10 @@ class Home extends Template
 		$usersAtHome = '';
 		$i = 0;
 		foreach ($users as $user) {
-			$i++;
 			if ($user['at_home'] == 'true') {
+				$i++;
 				$usersAtHome .= $user['username'];
-				if ($usersAtHome != "" && isset($users[$i + 1])){
+				if ($usersAtHome != "" && isset($users[$i + 1]) && $users[$i + 1]['at_home'] == 'true'){
 					$usersAtHome .= ', ';
 				}
 			}