diff --git a/panel/classes/Panel/Vmail/ForwardsAdd.php b/panel/classes/Panel/Vmail/ForwardsAdd.php
index 8df9aeb..1b4949b 100644
--- a/panel/classes/Panel/Vmail/ForwardsAdd.php
+++ b/panel/classes/Panel/Vmail/ForwardsAdd.php
@@ -49,7 +49,8 @@ class ForwardsAdd extends \Panel\Vmail {
       if ($result_code == 0) {
         $messages[] = "Success: Forwarding for email account $mbox@$domain added.";
         $f3->set('SESSION.messages', $messages);
-        if ($f3->get('SESSION.access') == 'vmail') {
+        $mapping = $f3->get('NAV.mapping');
+        if ($mapping == 'vmail') {
           $f3->reroute("/Accounts/$mbox/Forwarding");
         } else {
           $f3->reroute("/Email/$domain/Accounts/$mbox/Forwarding");