diff --git a/plugins/gtkgui/gtkgui.py b/plugins/gtkgui/gtkgui.py
index 75c8a7740399c9dfe920654c259e5f9b1bae5486..cc699eeaf906a920f5701d281f5447f3a54200be 100644
--- a/plugins/gtkgui/gtkgui.py
+++ b/plugins/gtkgui/gtkgui.py
@@ -430,11 +430,11 @@ class plugin:
 			if 'not in the roster' in u.groups:
 				u.groups.remove('not in the roster')
 			if len(u.groups) == 0:
-				u.groups = ['general']
+				u.groups = ['General']
 			self.roster.add_user_to_roster(u.jid, account)
 			self.send('UPDUSER', account, (u.jid, u.name, u.groups))
 		else:
-			user1 = User(jid, jid, ['general'], 'online', \
+			user1 = User(jid, jid, ['General'], 'online', \
 				'online', 'to', '', array[1], 0, '')
 			self.roster.contacts[account][jid] = [user1]
 			self.roster.add_user_to_roster(jid, account)
diff --git a/plugins/gtkgui/roster_window.py b/plugins/gtkgui/roster_window.py
index 0773393238b4a11fb8c775495f797dfe325486ce..31813470177c88ce5c13081febd84e145688e8be 100644
--- a/plugins/gtkgui/roster_window.py
+++ b/plugins/gtkgui/roster_window.py
@@ -121,11 +121,10 @@ class roster_window:
 			return
 		users = self.contacts[account][jid]
 		user = users[0]
-		if user.groups == []:
-			if user.jid.find("@") <= 0:
-				user.groups.append('Agents')
-			elif user.groups == []:
-				user.groups.append('general')
+		if user.jid.find("@") <= 0:
+			user.groups = ['Agents']
+		elif user.groups == []:
+			user.groups.append('General')
 
 		if (user.show == 'offline' or user.show == 'error') and not showOffline\
 			and not 'Agents' in user.groups and \
@@ -576,7 +575,7 @@ class roster_window:
 			pseudo = jid
 		self.plugin.send('SUB', account, (jid, txt))
 		if not self.contacts[account].has_key(jid):
-			user1 = User(jid, pseudo, ['general'], 'requested', \
+			user1 = User(jid, pseudo, ['General'], 'requested', \
 				'requested', 'none', 'subscribe', '', 0, '')
 			self.contacts[account][jid] = [user1]
 			self.add_user_to_roster(jid, account)