diff --git a/applications/crossbar/src/modules/cb_faxboxes.erl b/applications/crossbar/src/modules/cb_faxboxes.erl
index 823fdc9ab79..f6d9ab7de06 100644
--- a/applications/crossbar/src/modules/cb_faxboxes.erl
+++ b/applications/crossbar/src/modules/cb_faxboxes.erl
@@ -285,7 +285,7 @@ on_faxbox_successful_validation(DocId, Context) ->
 -spec generate_email_address(cb_context:context()) -> ne_binary().
 generate_email_address(Context) ->
     ResellerId =  cb_context:reseller_id(Context),
-    Domain = whapps_account_config:get(ResellerId, <<"fax">>, <<"default_smtp_domain">>, ?DEFAULT_FAX_SMTP_DOMAIN),
+    Domain = whapps_account_config:get_global(ResellerId, <<"fax">>, <<"default_smtp_domain">>, ?DEFAULT_FAX_SMTP_DOMAIN),
     New = wh_util:rand_hex_binary(4),
     <<New/binary, ".", Domain/binary>>.
 
@@ -322,7 +322,7 @@ is_faxbox_email_global_unique(Email, FaxBoxId) ->
 -spec maybe_register_cloud_printer(cb_context:context()) -> cb_context:context().
 maybe_register_cloud_printer(Context) ->
     ResellerId =  cb_context:reseller_id(Context),
-    CloudConnectorEnable = whapps_account_config:get(ResellerId, <<"fax">>, <<"enable_cloud_connector">>, 'false'), 
+    CloudConnectorEnable = whapps_account_config:get(ResellerId, <<"fax">>, <<"enable_cloud_connector">>, 'false'),
     case wh_util:is_true(CloudConnectorEnable) of
         'true' -> maybe_register_cloud_printer(Context, cb_context:doc(Context));
         'false' -> Context
diff --git a/applications/fax/src/fax_util.erl b/applications/fax/src/fax_util.erl
index ee66510ae43..38ec33a2524 100644
--- a/applications/fax/src/fax_util.erl
+++ b/applications/fax/src/fax_util.erl
@@ -66,7 +66,7 @@ content_type_to_extension(CT) when is_binary(CT) ->
 %%--------------------------------------------------------------------
 %% @private
 %% @doc
-%% Convert known extensions to media types 
+%% Convert known extensions to media types
 %% @end
 %%--------------------------------------------------------------------
 -spec extension_to_content_type(ne_binary() | string() | list()) -> ne_binary().
@@ -135,29 +135,42 @@ save_fax_attachment(JObj, FileContents, CT, Count) ->
             ,{'rev', Rev}
            ],
     Name = attachment_name(<<>>, CT),
-    case couch_mgr:put_attachment(?WH_FAXES, DocId, Name, FileContents, Opts) of
-        {'ok', _DocObj} ->
-            save_fax_doc_completed(DocId);
-        {'error', E} ->
-            lager:debug("Error ~p saving fax attachment on fax id ~s rev ~s",[E, DocId, Rev]),
-            save_fax_attachment(JObj, FileContents, CT, Count-1)
+    _ = couch_mgr:put_attachment(?WH_FAXES, DocId, Name, FileContents, Opts),
+    case check_fax_attachment(DocId, Name) of
+        {'ok', J} -> save_fax_doc_completed(J);
+        {'missing', J} ->
+            lager:debug("Missing fax attachment on fax id ~s rev ~s",[DocId, Rev]),
+            save_fax_attachment(J, FileContents, CT, Count-1);
+        {'error', _R} ->
+            lager:debug("Error ~p saving fax attachment on fax id ~s rev ~s",[_R, DocId, Rev]),
+            {'ok', J} = couch_mgr:open_doc(?WH_FAXES, DocId),
+            save_fax_attachment(J, FileContents, CT, Count-1)
     end.
 
--spec save_fax_doc_completed(ne_binary())-> {'ok', wh_json:object()} | {'error', any()}.
-save_fax_doc_completed(DocId)->
+-spec check_fax_attachment(ne_binary(), ne_binary())->
+                                  {'ok', wh_json:object()}
+                                      | {'missing', wh_json:object()}
+                                      | {'error', any()}.
+check_fax_attachment(DocId, Name) ->
     case couch_mgr:open_doc(?WH_FAXES, DocId) of
-        {'error', E} ->
-            lager:debug("error ~p reading fax ~s while setting to pending",[E, DocId]),
-            {'error', E};
         {'ok', JObj} ->
-            case couch_mgr:save_doc(?WH_FAXES, wh_json:set_values([{<<"pvt_job_status">>, <<"pending">>}], JObj)) of
-                {'ok', Doc} ->
-                    lager:debug("fax jobid ~s set to pending", [DocId]),
-                    {'ok', Doc};
-                {'error', E} ->
-                    lager:debug("error ~p setting fax jobid ~s to pending",[E, DocId]),
-                    {'error', E}
-            end
+            case wh_doc:attachment(JObj, Name) of
+                'undefined' -> {'missing', JObj};
+                _Else -> {'ok', JObj}
+            end;
+        {'error', _}=E -> E
+    end.
+
+-spec save_fax_doc_completed(wh_json:object())-> {'ok', wh_json:object()} | {'error', any()}.
+save_fax_doc_completed(JObj)->
+    DocId = wh_json:get_value(<<"_id">>, JObj),
+    case couch_mgr:save_doc(?WH_FAXES, wh_json:set_values([{<<"pvt_job_status">>, <<"pending">>}], JObj)) of
+        {'ok', Doc} ->
+            lager:debug("fax jobid ~s set to pending", [DocId]),
+            {'ok', Doc};
+        {'error', E} ->
+            lager:debug("error ~p setting fax jobid ~s to pending",[E, DocId]),
+            {'error', E}
     end.
 
 -spec notify_email_list(api_binary(), api_binary(), ne_binary() | list()) -> list().