diff --git a/plugins/gtkgui/config.py b/plugins/gtkgui/config.py
index f41f1036d..1bdba1b91 100644
--- a/plugins/gtkgui/config.py
+++ b/plugins/gtkgui/config.py
@@ -381,6 +381,9 @@ class accountPreference_Window:
 		if (name == ''):
 			warning_Window('You must enter a name for this account')
 			return 0
+		if name.find(' ') != -1:
+			warning_Window('Spaces are not permited in account name')
+			return 0
 		if (jid == '') or (string.count(jid, '@') != 1):
 			warning_Window('You must enter a Jabber ID for this account\n\
 				For example : login@hostname')
diff --git a/plugins/gtkgui/dialogs.py b/plugins/gtkgui/dialogs.py
index 1b0dfe8a9..28596a2e2 100644
--- a/plugins/gtkgui/dialogs.py
+++ b/plugins/gtkgui/dialogs.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-##	plugins/gtkgui.py
+##	plugins/dialogs.py
 ##
 ## Gajim Team:
 ## 	- Yann Le Boulanger <asterix@crans.org>