diff --git a/plugins/ktcore/KTDocumentActions.php b/plugins/ktcore/KTDocumentActions.php
index b3ffc90..05b5961 100644
--- a/plugins/ktcore/KTDocumentActions.php
+++ b/plugins/ktcore/KTDocumentActions.php
@@ -574,7 +574,8 @@ class KTDocumentArchiveAction extends KTDocumentAction {
             }
         }
 
-        controllerRedirect('viewDocument', 'fDocumentId=' .  $this->oDocument->getId());
+        $_SESSION['KTInfoMessage'][] = _("Document archived.");
+        controllerRedirect('browse', 'fFolderId=' .  $this->oDocument->getFolderID());
         exit(0);
     }
 }
diff --git a/plugins/ktstandard/KTSubscriptions.php b/plugins/ktstandard/KTSubscriptions.php
index 83124fe..0360007 100644
--- a/plugins/ktstandard/KTSubscriptions.php
+++ b/plugins/ktstandard/KTSubscriptions.php
@@ -228,7 +228,7 @@ class KTArchiveSubscriptionTrigger {
         // fire subscription alerts for the checked in document
         $oSubscriptionEvent = new SubscriptionEvent();
         $oFolder = Folder::get($oDocument->getFolderID());
-        $oSubscriptionEvent->ArchiveDocument($oDocument, $oFolder);
+        $oSubscriptionEvent->ArchivedDocument($oDocument, $oFolder);
     }
 }
 // }}}
diff --git a/templates/ktcore/action/archive.smarty b/templates/ktcore/action/archive.smarty
index 687bae1..98f4758 100644
--- a/templates/ktcore/action/archive.smarty
+++ b/templates/ktcore/action/archive.smarty
@@ -11,14 +11,14 @@ archive</a>.{/i18n}</p>
 
 <form method="POST" action="{$smarty.server.PHP_SELF}">
 <fieldset><legend>{i18n}Archive{/i18n}</legend>
-<input type="hidden" name="action" value="move" />
+<input type="hidden" name="action" value="archive" />
 <input type="hidden" name="fDocumentId" value="{$iDocumentId}" />
 {foreach from=$fields item=oWidget }
   {$oWidget->render()}
 {/foreach}
 
 <div class="form_actions">
-<input type="submit" name="submit[move]" value="{i18n}Move{/i18n}" />
+<input type="submit" name="submit[archive]" value="{i18n}Archive{/i18n}" />
 <input type="submit" name="submit[cancel]" value="{i18n}Cancel{/i18n}" />
 </div>
 </fieldset>