diff --git a/app/config/version.php b/app/config/version.php index 4a9397aa2f..38471e9071 100644 --- a/app/config/version.php +++ b/app/config/version.php @@ -1,5 +1,5 @@ 'v2.0.5-pre', - 'hash_version' => 'v2.0.5-pre-156-gf6e2654', + 'hash_version' => 'v2.0.5-pre-157-g5931587', ); \ No newline at end of file diff --git a/app/controllers/admin/UsersController.php b/app/controllers/admin/UsersController.php index 3588e14c40..6033a9a406 100755 --- a/app/controllers/admin/UsersController.php +++ b/app/controllers/admin/UsersController.php @@ -46,7 +46,7 @@ class UsersController extends AdminController { 'first_name' => 'required|alpha_space|min:2', 'last_name' => 'required|alpha_space|min:2', 'location_id' => 'numeric', - 'username' => 'required|min:2|unique:users,username, ', + 'username' => 'required|min:2|unique:users,deleted_at,NULL', 'email' => 'email|unique:users,email', 'password' => 'required|min:6', 'password_confirm' => 'required|min:6|same:password',