diff --git a/include/staff/cannedreply.inc.php b/include/staff/cannedreply.inc.php
index fa8e4615a9f91e4cdfc705e0ca261b9ab67886f6..55e29db7d686880c5b3267f9803acfb94f83574b 100644
--- a/include/staff/cannedreply.inc.php
+++ b/include/staff/cannedreply.inc.php
@@ -77,7 +77,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
                 if($canned && ($files=$canned->getAttachments())) {
                     echo '<div id="canned_attachments"><span class="faded">Uncheck to delete the attachment on submit</span><br>';
                     foreach($files as $file) {
-                        $hash=$file['hash'].md5($file['id'].session_id());
+                        $hash=$file['hash'].md5($file['id'].session_id().$file['hash']);
                         echo sprintf('<label><input type="checkbox" name="files[]" id="f%d" value="%d" checked="checked">
                                       <a href="file.php?h=%s">%s</a>&nbsp;&nbsp;</label>&nbsp;',
                                       $file['id'], $file['id'], $hash, $file['name']);
diff --git a/scp/canned.php b/scp/canned.php
index 1cb77bc0884c026fd3a0c6626a74b8f21fea1f2e..cb6da802e404396d561ba306eb4972da3ec2249a 100644
--- a/scp/canned.php
+++ b/scp/canned.php
@@ -54,7 +54,7 @@ if($_POST && $thisstaff->canManageCannedResponses()) {
             }
             break;
         case 'create':
-            if(($id=Canned::create($_POST, $_FILES['attachments'], $errors))) {
+            if(($id=Canned::create($_POST, $errors))) {
                 $msg='Canned response added successfully';
                 $_REQUEST['a']=null;
                 //Upload attachments