From 4be5fe0d0e4d381a7cbf225cf173f5806b148062 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 28 Jan 2016 01:42:43 -0500
Subject: [PATCH] improve new user error message

---
 dashboard-ui/scripts/usernew.js | 15 ++++++++++++---
 dashboard-ui/usernew.html       |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/dashboard-ui/scripts/usernew.js b/dashboard-ui/scripts/usernew.js
index 9856d117da..8ed0a0910e 100644
--- a/dashboard-ui/scripts/usernew.js
+++ b/dashboard-ui/scripts/usernew.js
@@ -107,15 +107,24 @@
                 Dashboard.navigate("useredit.html?userId=" + user.Id);
             });
 
-        }, function () {
+        }, function (response) {
+
+            if (response.status == 400) {
+
+                Dashboard.alert({
+                    message: page.querySelector('.labelNewUserNameHelp').innerHTML
+                });
+
+            } else {
+                Dashboard.alert(Globalize.translate('DefaultErrorMessage'));
+            }
 
-            Dashboard.alert(Globalize.translate('DefaultErrorMessage'));
             Dashboard.hideLoadingMsg();
         });
     }
 
     function onSubmit() {
-        var page = $(this).parents('.page');
+        var page = $(this).parents('.page')[0];
 
         Dashboard.showLoadingMsg();
 
diff --git a/dashboard-ui/usernew.html b/dashboard-ui/usernew.html
index dc3eb4ce13..49c2f7af50 100644
--- a/dashboard-ui/usernew.html
+++ b/dashboard-ui/usernew.html
@@ -14,7 +14,7 @@
                         <li id="fldUserName">
                             <label for="txtUserName">${LabelName}</label>
                             <input id="txtUserName" required="required" type="text" />
-                            <div class="fieldDescription">${LabelNewUserNameHelp}</div>
+                            <div class="fieldDescription labelNewUserNameHelp">${LabelNewUserNameHelp}</div>
                         </li>
                     </ul>