diff --git a/www/pages/ajax_profile.php b/www/pages/ajax_profile.php
index 4bb8cc5e6..ed21572a9 100644
--- a/www/pages/ajax_profile.php
+++ b/www/pages/ajax_profile.php
@@ -6,7 +6,7 @@ if (!$page->users->isLoggedIn())
 if (isset($_GET['action']) && $_GET['action'] == "1" && isset($_GET['emailto']))
 {
 	$emailto = $_GET['emailto'];
-	$ret = $page->users->sendInvite($page->site->title, $page->site->email, $page->serverurl, $page->users->currentUserId(), $emailto);
+	$ret = $page->users->sendInvite($page->settings->getSetting('title'), $page->settings->getSetting('email'), $page->serverurl, $page->users->currentUserId(), $emailto);
 	if (!$ret)
 		print "Invite not sent.";
 	else
diff --git a/www/pages/contact-us.php b/www/pages/contact-us.php
index 588ee86ba..f05c51fb7 100644
--- a/www/pages/contact-us.php
+++ b/www/pages/contact-us.php
@@ -9,7 +9,7 @@ if (isset($_POST["useremail"])) {
 
 	if ($page->captcha->getError() === false) {
 		$email = $_POST["useremail"];
-		$mailto = $page->site->email;
+		$mailto = $page->settings->getSetting('email');
 		$mailsubj = "Contact Form Submitted";
 		$mailhead = "From: $email\n";
 		$mailbody = "Values submitted from contact form:\n";
@@ -24,13 +24,13 @@ if (isset($_POST["useremail"])) {
 			Utility::sendEmail($mailto, $mailsubj, $mailbody, $email);
 		}
 
-		$page->smarty->assign("msg", "<h2 style='padding-top:25px;'>Thanks for getting in touch with " . $page->site->title . ".</h2>");
+		$page->smarty->assign("msg", "<h2 style='padding-top:25px;'>Thanks for getting in touch with " . $page->settings->getSetting('title') . ".</h2>");
 	}
 }
-$page->title = "Contact ".$page->site->title;
-$page->meta_title = "Contact ".$page->site->title;
+$page->title = "Contact ".$page->settings->getSetting('title');
+$page->meta_title = "Contact ".$page->settings->getSetting('title');
 $page->meta_keywords = "contact us,contact,get in touch,email";
-$page->meta_description = "Contact us at ".$page->site->title." and submit your feedback";
+$page->meta_description = "Contact us at ".$page->settings->getSetting('title')." and submit your feedback";
 
 $page->content = $page->smarty->fetch('contact.tpl');
 
diff --git a/www/pages/queue.php b/www/pages/queue.php
index d6e2e04e8..8a524740e 100644
--- a/www/pages/queue.php
+++ b/www/pages/queue.php
@@ -12,7 +12,7 @@ $page->smarty->assign('user', $userData);
 
 $queueType = $error = '';
 $queue = null;
-switch($page->site->sabintegrationtype) {
+switch($page->settings->getSetting('sabintegrationtype')) {
 	case SABnzbd::INTEGRATION_TYPE_NONE:
 		if ($userData['queuetype'] == 2) {
 			$queueType = 'NZBGet';
diff --git a/www/pages/register.php b/www/pages/register.php
index f4ea60022..5ce789041 100644
--- a/www/pages/register.php
+++ b/www/pages/register.php
@@ -1,16 +1,17 @@
 <?php
+use newznab\db\Settings;
 
 if ($page->users->isLoggedIn())
 	$page->show404();
 
 $showregister = 1;
 
-if ($page->site->registerstatus == Sites::REGISTER_STATUS_CLOSED)
+if ($page->settings->getSetting('registerstatus') == Settings::REGISTER_STATUS_CLOSED)
 {
 	$page->smarty->assign('error', "Registrations are currently disabled.");
 	$showregister = 0;
 }
-elseif ($page->site->registerstatus == Sites::REGISTER_STATUS_INVITE && (!isset($_REQUEST['invitecode']) || empty($_REQUEST['invitecode'])))
+elseif ($page->settings->getSetting('registerstatus') == Sites::REGISTER_STATUS_INVITE && (!isset($_REQUEST['invitecode']) || empty($_REQUEST['invitecode'])))
 {
 	$page->smarty->assign('error', "Registrations are currently invite only.");
 	$showregister = 0;
diff --git a/www/pages/sitemap.php b/www/pages/sitemap.php
index b0424b943..f044ac35f 100644
--- a/www/pages/sitemap.php
+++ b/www/pages/sitemap.php
@@ -69,10 +69,10 @@ if (isset($_GET["type"]) && $_GET["type"] == "xml")
 }
 else
 {
-	$page->title = $page->site->title. " site map";
-	$page->meta_title = $page->site->title. " site map";
+	$page->title = $page->settings->getSetting('title'). " site map";
+	$page->meta_title = $page->settings->getSetting('title'). " site map";
 	$page->meta_keywords = "sitemap,site,map";
-	$page->meta_description = $page->site->title." site map shows all our pages.";
+	$page->meta_description = $page->settings->getSetting('title')." site map shows all our pages.";
 	$page->content = $page->smarty->fetch('sitemap.tpl');
 	$page->render();
 }
diff --git a/www/pages/terms-and-conditions.php b/www/pages/terms-and-conditions.php
index 8c77715a8..636e80937 100644
--- a/www/pages/terms-and-conditions.php
+++ b/www/pages/terms-and-conditions.php
@@ -1,9 +1,9 @@
 <?php
 
 $page->title = "Terms and Conditions";
-$page->meta_title = $page->site->title." - Terms and conditions";
+$page->meta_title = $page->settings->getSetting('title')." - Terms and conditions";
 $page->meta_keywords = "terms,conditions";
-$page->meta_description = "Terms and Conditions for ".$page->site->title;
+$page->meta_description = "Terms and Conditions for ".$page->settings->getSetting('title');
 
 $page->content = $page->smarty->fetch('terms.tpl');