Merge branch 'master' into bharat_dev

1 files changed, 7 insertions, 1 deletions

diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index 650dcf6a..55153263 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -72,7 +72,13 @@ class user_Core {
 
   static function valid_password($password_input) {
     if (!user::is_correct_password(identity::active_user(), $password_input->value)) {
-      $password_input->add_error("invalid", 1);
+      $password_input->add_error("invalid_password", 1);
+    }
+  }
+
+  static function valid_username($text_input) {
+    if (!self::lookup_by_name($text_input->value)) {
+      $text_input->add_error("invalid_username", 1);
     }
   }