diff --git a/ogcp/views.py b/ogcp/views.py
index 7e7877e..ef64ade 100644
--- a/ogcp/views.py
+++ b/ogcp/views.py
@@ -3485,6 +3485,14 @@ def user_add_post():
         flash(form.errors, category='error')
         return redirect(url_for('users'))
 
+    if re.search(r'\s', form.username.data):
+        flash(_('The username cannot contain spaces'), category='error')
+        return redirect(url_for('users'))
+
+    if re.search(r'\s', form.pwd.data):
+        flash(_('The password cannot contain spaces'), category='error')
+        return redirect(url_for('users'))
+
     if get_user(form.username.data):
         flash(_('This username already exists'), category='error')
         return redirect(url_for('users'))