diff --git a/applications/crossbar/src/modules_v2/cb_users_v2.erl b/applications/crossbar/src/modules_v2/cb_users_v2.erl
index afc734ac7c0..900455ddb34 100644
--- a/applications/crossbar/src/modules_v2/cb_users_v2.erl
+++ b/applications/crossbar/src/modules_v2/cb_users_v2.erl
@@ -423,10 +423,9 @@ maybe_send_email(Context) ->
 send_email(Context) ->
     lager:debug("trying to publish new user notification"),
     Doc = cb_context:doc(Context),
-    ReqData = cb_context:req_data(Context),
     Req = [{<<"Account-ID">>, cb_context:account_id(Context)}
           ,{<<"User-ID">>, kz_doc:id(Doc)}
-          ,{<<"Password">>, kz_json:get_value(<<"password">>, ReqData)}
+          ,{<<"Password">>, cb_context:fetch(Context, <<"req_password">>)}
            | kz_api:default_headers(?APP_NAME, ?APP_VERSION)
           ],
     kapps_notify_publisher:cast(Req, fun kapi_notifications:publish_new_user/1).
@@ -473,9 +472,11 @@ validate_patch(UserId, Context) ->
 %% @end
 %%------------------------------------------------------------------------------
 -spec validate_request(kz_term:api_binary(), cb_context:context()) -> cb_context:context().
-validate_request(UserId, Context) ->
-    ReqJObj = cb_context:req_data(Context),
-    AccountId = cb_context:account_id(Context),
+validate_request(UserId, Context0) ->
+    ReqJObj = cb_context:req_data(Context0),
+    AccountId = cb_context:account_id(Context0),
+
+    Context = cb_context:store(Context0, <<"req_password">>, kz_json:get_value(<<"password">>, ReqJObj)),
 
     case kzd_users:validate(AccountId, UserId, ReqJObj) of
         {'true', UserJObj} when is_binary(UserId) ->