diff --git a/include/class.config.php b/include/class.config.php
index 95c5c2ff15b4b02e45bed2d5854e4f9905a5b4a7..165ad08463df42accd6f41f24090f5be5944d9d7 100644
--- a/include/class.config.php
+++ b/include/class.config.php
@@ -1442,7 +1442,7 @@ class OsticketConfig extends Config {
 
         if (isset($vars['delete-backdrop']))
             foreach ($vars['delete-backdrop'] as $id)
-                if (($vars['selected-logo'] != $id)
+                if (($vars['selected-backdrop'] != $id)
                         && ($f = AttachmentFile::lookup((int) $id)))
                     $f->delete();
 
diff --git a/include/class.user.php b/include/class.user.php
index bc36bd7bc256dcd3bb18c9b8faba79010b3683bc..24cae58b9122dc8a5ee3af8ceb9183720e7524d6 100644
--- a/include/class.user.php
+++ b/include/class.user.php
@@ -963,13 +963,6 @@ class UserAccount extends VerySimpleModel {
     }
 
     function getUser() {
-        // FIXME: The ORM will expect a ClientAccount instance as the
-        // User.account relationship is defined thusly; however, $this is an
-        // instance of UserAccount. Therefore we will (cast) to a
-        // ClientAccount instance first. This could be better rectified by
-        // collapsing UserAccount into ClientAccount.
-        $acct = new ClientAccount($this->ht);
-        $this->user->set('account', $acct);
         return $this->user;
     }
 
diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php
index ffa44110ddfd50918cf063916db136c880d7e07f..c634971b3fd1dc97a10008b8b95344b4ce69393c 100644
--- a/include/staff/ticket-view.inc.php
+++ b/include/staff/ticket-view.inc.php
@@ -897,7 +897,7 @@ if ($errors['err'] && isset($_POST['a'])) {
     </p>
     <p class="confirm-action" style="display:none;" id="delete-confirm">
         <font color="red"><strong><?php echo sprintf(
-            __('Are you sure you want to DELETE %s?', __('this ticket')));?></strong></font>
+            __('Are you sure you want to DELETE %s?'), __('this ticket'));?></strong></font>
         <br><br><?php echo __('Deleted data CANNOT be recovered, including any associated attachments.');?>
     </p>
     <div><?php echo __('Please confirm to continue.');?></div>