diff --git a/customize.dist/src/less2/include/support.less b/customize.dist/src/less2/include/support.less
index 1667b7d6e..a07d9d316 100644
--- a/customize.dist/src/less2/include/support.less
+++ b/customize.dist/src/less2/include/support.less
@@ -91,7 +91,7 @@
                     }
                 }
                 .cp-support-form-container {
-                    display: none !important;
+                    display: none;
                 }
             }
             button {
diff --git a/www/admin/app-admin.less b/www/admin/app-admin.less
index 9a1a61e57..c9b8bdc02 100644
--- a/www/admin/app-admin.less
+++ b/www/admin/app-admin.less
@@ -107,6 +107,16 @@
                 background-color: @cp_admin-premium-bg;
             }
         }
+        &.cp-support-list-closed {
+            .cp-support-list-actions {
+                .cp-support-answer {
+                    display: inline !important;
+                }
+            }
+            .cp-support-form-container {
+                display: block !important;
+            }
+        }
     }
 
     .cp-support-list-ticket:not(.cp-support-list-closed) {
diff --git a/www/admin/inner.js b/www/admin/inner.js
index bc2085681..6f0b9d2df 100644
--- a/www/admin/inner.js
+++ b/www/admin/inner.js
@@ -840,6 +840,7 @@ define([
                     return;
                 }
                 if (msg.type !== 'TICKET') { return; }
+                $ticket.removeClass('cp-support-list-closed');
 
                 if (!$ticket.length) {
                     $ticket = APP.support.makeTicket($div, content, function (hideButton) {
diff --git a/www/support/inner.js b/www/support/inner.js
index eed95c4a9..0c70e7900 100644
--- a/www/support/inner.js
+++ b/www/support/inner.js
@@ -119,6 +119,7 @@ define([
                     return;
                 }
                 if (msg.type !== 'TICKET') { return; }
+                $ticket.removeClass('cp-support-list-closed');
 
                 if (!$ticket.length) {
                     $ticket = APP.support.makeTicket($div, content, function () {
diff --git a/www/support/ui.js b/www/support/ui.js
index 175191200..03c7feed3 100644
--- a/www/support/ui.js
+++ b/www/support/ui.js
@@ -52,6 +52,11 @@ define([
                 });
                 return ret;
             }).filter(Boolean);
+
+            // "dest" is the recipient that is not the admin support mailbox.
+            // In the support page, make sure dest is always ourselves.
+            dest.channel = privateData.support;
+            dest.curvePublic = user.curvePublic;
         }
 
         // Send the message to the admin mailbox and to the user mailbox