diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index 151ab6cdec..16faaf667e 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -776,6 +776,12 @@ $(document).ready(function () {
 				t('settings', 'Error creating user'));
 			return false;
 		}
+		if ($.trim(username).length !== username.length) {
+			OC.dialogs.alert(
+				t('settings', 'Username contains whitespace at the beginning or at the end'),
+				t('settings', 'Error creating user'));
+			return false;
+		}
 		if ($.trim(password) === '') {
 			OC.dialogs.alert(
 				t('settings', 'A valid password must be provided'),