diff --git a/data/web/inc/functions.mailbox.inc.php b/data/web/inc/functions.mailbox.inc.php
index 0c368835..4fe6fb4a 100644
--- a/data/web/inc/functions.mailbox.inc.php
+++ b/data/web/inc/functions.mailbox.inc.php
@@ -614,7 +614,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
               $_SESSION['return'][] = array(
                 'type' => 'danger',
                 'log' => array(__FUNCTION__, $_action, $_type, $_data_log, $_attr),
-                'msg' => 'alias_invalid'
+                'msg' => array('alias_invalid', $address)
               );
               continue;
             }
@@ -1713,7 +1713,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
               $_SESSION['return'][] = array(
                 'type' => 'danger',
                 'log' => array(__FUNCTION__, $_action, $_type, $_data_log, $_attr),
-                'msg' => 'alias_invalid'
+                'msg' => array('alias_invalid', $address)
               );
               continue;
             }
@@ -1733,7 +1733,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
                 $_SESSION['return'][] = array(
                   'type' => 'danger',
                   'log' => array(__FUNCTION__, $_action, $_type, $_data_log, $_attr),
-                  'msg' => 'alias_invalid'
+                  'msg' => array('alias_invalid', $address)
                 );
                 continue;
               }
diff --git a/data/web/js/build/014-mailcow.js b/data/web/js/build/014-mailcow.js
index 26602714..0c49efaf 100644
--- a/data/web/js/build/014-mailcow.js
+++ b/data/web/js/build/014-mailcow.js
@@ -56,6 +56,13 @@ $(document).ready(function() {
     'use strict';
     if ($('a[data-toggle="tab"]').length) {
       $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
+        $("ul.nav-tabs li a").parent().find("a").each(function(){
+          var t = $(this).text();
+          t = t.replace(/^⤏ /, '');
+          $(this).text(t);
+        });
+        $(this).prepend("⤏ ");
+
         if ($(this).data('dont-remember') == 1) {
           return true;
         }
diff --git a/data/web/js/site/admin.js b/data/web/js/site/admin.js
index cb83361e..8a3ece31 100644
--- a/data/web/js/site/admin.js
+++ b/data/web/js/site/admin.js
@@ -62,11 +62,6 @@ jQuery(function($){
     draw_table = $(this).data('draw');
     eval(draw_table + '()');
   });
-  if (localStorage.getItem("current_page") === null) {
-    var current_page = {};
-  } else {
-    var current_page = JSON.parse(localStorage.getItem('current_page'));
-  }
   function table_admin_ready(ft, name) {
     heading = ft.$el.parents('.panel').find('.panel-heading')
     var ft_paging = ft.use(FooTable.Paging)