diff --git a/src/common/commands.py b/src/common/commands.py
index 1c012290ddf990848ede64ddb7b9e24f64e341b1..bbe5385f927e3350e31263005423cb358524a051 100644
--- a/src/common/commands.py
+++ b/src/common/commands.py
@@ -97,7 +97,7 @@ class ChangeStatusCommand(AdHocCommand):
 					var = 'presence-type',
 					label = 'Type of presence:',
 					options = [
-						(u'free-for-chat', _('Free for chat')),
+						(u'chat', _('Free for chat')),
 						(u'online', _('Online')),
 						(u'away', _('Away')),
 						(u'xa', _('Extended away')),
@@ -128,7 +128,7 @@ class ChangeStatusCommand(AdHocCommand):
 		try:
 			presencetype = form['presence-type'].value
 			if not presencetype in \
-			('free-for-chat', 'online', 'away', 'xa', 'dnd', 'offline'):
+			('chat', 'online', 'away', 'xa', 'dnd', 'offline'):
 				self.badRequest(request)
 				return False
 		except Exception:	# KeyError if there's no presence-type field in form or