diff --git a/monica/Dockerfile b/monica/Dockerfile
index 8f585c13d..70ac9e3a3 100644
--- a/monica/Dockerfile
+++ b/monica/Dockerfile
@@ -58,6 +58,12 @@ RUN chmod 744 /ha_autoapps.sh && /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.
 # 4 Entrypoint #
 ################
 
+# Fix Monica issues
+RUN for file in $(grep -rl "could you verify your email address by clicking on the link we just emailed to you" /var/www/html 2>/dev/null); do sed -i "s|we just emailed to you|that you can find in the addon log, starting with Please click the button below to verify your email address|g" "$file"; done && \
+    \
+    # Fix dummy password
+    sed -i "s|admin123|Changeme123\!|g" /var/www/html/app/Console/Commands/Local/SetupDummyAccount.php
+
 # Add entrypoint
 ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"