diff --git a/init.el b/init.el
index 2f51ce8..17d60e1 100644
--- a/init.el
+++ b/init.el
@@ -1126,6 +1126,9 @@ already been connected to."
               (enable-circe-display-images)
               (enable-circe-new-day-notifier)))
 
+  (add-hook 'modus-themes-after-load-theme-hook
+            #'circe-nick-color-reset)
+
   (let ((len (number-to-string (- acdw-irc/left-margin 1
                                   (+ (length acdw-irc/pre-nick)
                                      (length acdw-irc/post-nick)))))
@@ -1165,7 +1168,7 @@ already been connected to."
                           scroll-margin 0
                           word-wrap t
                           wrap-prefix (repeat-string
-                                       (1+ acdw-irc/left-margin) " "))
+                                       acdw-irc/left-margin " "))
               ;; (enable-lui-track-bar)
               )))