diff --git a/CHANGELOG b/CHANGELOG
index 96b5b8d4..768cbc42 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,7 +2,11 @@ This file describes the new features in each poezio release.
 For more detailed changelog, see the roadmap:
 http://codingteam.net/project/poezio/roadmap
 
-* Poezio 0.6.2 - dev
+* Poezio 0.7 - dev
+Complete the MUC support
+- bugfixes
+
+* Poezio 0.6.2 - 21 Jul 2010
 - Lines are now broken between words and not in the middle of them
 - /unquery command
 - default nickname is now $USER
diff --git a/src/gui.py b/src/gui.py
index 299770eb..4c95566f 100644
--- a/src/gui.py
+++ b/src/gui.py
@@ -744,10 +744,10 @@ class Gui(object):
         """
         /show <status> [msg]
         """
-        possible_show = {'avail':'None',
-                         'available':'None',
-                         'ok':'None',
-                         'here':'None',
+        possible_show = {'avail':None,
+                         'available':None,
+                         'ok':None,
+                         'here':None,
                          'chat':'chat',
                          'away':'away',
                          'afk':'away',
diff --git a/src/multiuserchat.py b/src/multiuserchat.py
index a64b5796..d2598397 100644
--- a/src/multiuserchat.py
+++ b/src/multiuserchat.py
@@ -291,7 +291,8 @@ class MultiUserChat(object):
 
     def change_show(self, room, nick, show, status):
         pres = Presence(to='%s/%s' % (room, nick))
-        pres.setShow(show)
+        if show: # if show is None, don't put a <show /> tag. It means "online"
+            pres.setShow(show)
         if status:
             pres.setStatus(status)
         self.connection.send(pres)