diff --git a/mozilla/webtools/partytool/controllers/parties_controller.php b/mozilla/webtools/partytool/controllers/parties_controller.php
index dd74d31bf3d..0c11ccca2b0 100644
--- a/mozilla/webtools/partytool/controllers/parties_controller.php
+++ b/mozilla/webtools/partytool/controllers/parties_controller.php
@@ -243,8 +243,8 @@ class PartiesController extends AppController {
     $this->pageTitle = "Invite a Guest";
     if (is_numeric($id)) {
       $party = $this->Party->findById($id);
-      if (empty($party['Party']['id']) &&
-          $party['Party']['owner'] !== $_SESSION['User']['id'])
+      if (empty($party['Party']['id']) ||
+          $party['Party']['owner'] != $_SESSION['User']['id'])
         $this->redirect('/parties/view/all');
 
       else {
diff --git a/mozilla/webtools/partytool/views/layouts/default.thtml b/mozilla/webtools/partytool/views/layouts/default.thtml
index e78d0658f7d..5386ce2ee61 100755
--- a/mozilla/webtools/partytool/views/layouts/default.thtml
+++ b/mozilla/webtools/partytool/views/layouts/default.thtml
@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title><?php echo APP_NAME." - ".$title_for_layout?></title>
-    <link rel="shortcut icon" href="favicon.ico" type="image/x-icon"/>
+    <link rel="shortcut icon" href="<?php echo $html->url('/favicon.ico'); ?>" type="image/x-icon"/>
     <link rel="stylesheet" type="text/css" href="<?php echo $html->url('/css/main.css'); ?>"/>
     <link rel="alternate" type="application/rss+xml" href="<?php echo $html->url('/feeds/latest'); ?>"/>
   </head>
@@ -37,4 +37,4 @@
       </div>
     </div>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/mozilla/webtools/partytool/views/parties/invited.thtml b/mozilla/webtools/partytool/views/parties/invited.thtml
index edbf108d8e0..4ee03b344d3 100755
--- a/mozilla/webtools/partytool/views/parties/invited.thtml
+++ b/mozilla/webtools/partytool/views/parties/invited.thtml
@@ -5,7 +5,7 @@
 <div style="text-align: center">
   <div style="width: 50%; float: left;">
     <h2>New User</h2>
-    <p>Simply register for an account and you'll be added as a guest as soon as you finish.
+    <p>Simply register for an account, and you'll be added as a guest as soon as you finish.
       <a href="<?php echo $html->url('/users/register'); ?>">Create account &raquo;</a></p>
   </div>
   <div style="width: 50%; float: right">
@@ -33,4 +33,4 @@
 if (isset($party) && isset($confirm_only)): ?>
 <p>You've been invited to attend <a href="<?php echo $html->url('/parties/view/'.$party['Party']['id']); ?>"><?php echo $party['Party']['name']; ?></a>.
   To join this party, <a href="<?php echo $html->url('/parties/invited/'.$icode.'/confirm');?>">click here</a>, or cancel this invitation by <a href="<?php echo $html->url('/parties/invited/cancel/');?>">clicking here</a>.</p>
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>
