diff --git a/roles/zimbra/tasks/mailbox.yml b/roles/zimbra/tasks/mailbox.yml
index 278b174..32e5592 100644
--- a/roles/zimbra/tasks/mailbox.yml
+++ b/roles/zimbra/tasks/mailbox.yml
@@ -164,3 +164,13 @@
     line: '#30 23 * * * /opt/zimbra/libexec/zmdailyreport -m'
   notify: reload crond
   tags: zcs
+
+# https://forums.zimbra.org/viewtopic.php?t=72204
+- name: Remove hostedlogin
+  file: path={{ item }} state=absent
+  loop:
+    - /opt/zimbra/jetty_base/webapps/zimbra/public/hostedlogin.jsp
+    - /opt/zimbra/jetty_base/work/zimbra/jsp/org/apache/jsp/public_/hostedlogin_jsp.class
+    - /opt/zimbra/jetty_base/work/zimbra/jsp/org/apache/jsp/public_/hostedlogin_jsp.java
+  notify: restart zimbra
+  tags: zcs