diff --git a/page_welcome/login.php b/page_welcome/login.php
index c1cc6a57eafb4fc37f49f761f1c80c53022508b4..b9a0873af64a0fbcd134bbf65cb2b1f420ab94da 100644
--- a/page_welcome/login.php
+++ b/page_welcome/login.php
@@ -33,8 +33,15 @@ $user = mysqli_fetch_assoc($result);
 
 if ($user && count($errors) == 0) { // if user exists
   $_SESSION['username'] = $username;
+  $_SESSION['user_id'] = $user['id'];
+  $user_id = $_SESSION['user_id'];
   $_SESSION['email'] = $user['email'];
+  $fav_check_query = "SELECT * FROM favorites WHERE userid='$user_id' LIMIT 1";
+  $favresult = mysqli_query($db, $fav_check_query);
+  $favorites = mysqli_fetch_assoc($favresult);
 	$_SESSION['success'] = "You are now logged in";
+  $_SESSION['twitter'] = unserialize($favorites['twitter']);
+  $_SESSION['youtube'] = unserialize($favorites['youtube']);
   header('location: index.php');
 }
 // if user doesn't exist
diff --git a/page_welcome/register.php b/page_welcome/register.php
index 50ea42d88f7f889839c4ca799694195af0866977..dda3227c2e63341991ad2f8e1c1b59ce3127af11 100644
--- a/page_welcome/register.php
+++ b/page_welcome/register.php
@@ -45,6 +45,7 @@ if (isset($_POST['register'])) {
       array_push($errors, "email already exists");
     }
   }
+  $empty_array = array();
   // Finally, register user if there are no errors in the form
   if (count($errors) == 0) {
 
@@ -55,6 +56,16 @@ if (isset($_POST['register'])) {
   	mysqli_query($db, $query);
   	$_SESSION['username'] = $username;
     $_SESSION['email'] = $email;
+    $user_check_query = "SELECT * FROM users WHERE username='$username' LIMIT 1";
+    $result = mysqli_query($db, $user_check_query);
+    $user = mysqli_fetch_assoc($result);
+    $_SESSION['user_id'] = $user['id'];
+    $user_id = $_SESSION['user_id'];
+    $query = "INSERT INTO favorites (userid, twitter, youtube)
+  			  VALUES('$user_id', '$empty_array', '$empty_array')";
+  	mysqli_query($db, $query);
+    $_SESSION['twitter'] = $empty_array;
+    $_SESSION['youtube'] = $empty_array;
   	$_SESSION['success'] = "You are now logged in";
   	header('location: index.php');
   }