=== modified file 'lisp/erc/ChangeLog'
--- lisp/erc/ChangeLog	2012-02-09 07:48:22 +0000
+++ lisp/erc/ChangeLog	2012-03-05 16:26:23 +0000
@@ -1,3 +1,9 @@
+2012-03-05  Deniz Dogan  <deniz@dogan.se>
+
+	* erc-backend.el (erc-process-sentinel): Clear channel user lists
+	upon disconnection.  This prevents invalid channel user lists when
+	reconnecting.
+
 2012-02-08  Glenn Morris  <rgm@gnu.org>

 	* erc-backend.el (erc-coding-system-precedence):
@@ -277,4 +283,3 @@
 ;; coding: utf-8
 ;; add-log-time-zone-rule: t
 ;; End:
-

=== modified file 'lisp/erc/erc-backend.el'
--- lisp/erc/erc-backend.el	2012-02-08 08:07:24 +0000
+++ lisp/erc/erc-backend.el	2012-03-02 15:22:22 +0000
@@ -680,6 +680,9 @@
                    (setq erc-server-ping-handler nil)))
           (run-hook-with-args 'erc-disconnected-hook
                               (erc-current-nick) (system-name) "")
+          (dolist (buf (erc-buffer-filter (lambda () (boundp 'erc-channel-users)) cproc))
+            (with-current-buffer buf
+              (setq erc-channel-users (make-hash-table :test 'equal))))
           ;; Remove the prompt
           (goto-char (or (marker-position erc-input-marker) (point-max)))
           (forward-line 0)