diff --git a/src/ejabberd_auth_external.erl b/src/ejabberd_auth_external.erl
index b1ec7a9bd..333543b0b 100644
--- a/src/ejabberd_auth_external.erl
+++ b/src/ejabberd_auth_external.erl
@@ -315,7 +315,7 @@ get_mod_last_configured(Server) ->
     end.
 
 is_configured(Host, Module) ->
-    Os = ejabberd_config:get_local_option({modules, Host},
+    Os = ejabberd_config:get_option({modules, Host},
 					  fun(M) when is_list(M) -> M end),
     lists:keymember(Module, 1, Os).
 
diff --git a/src/ejabberd_auth_riak.erl b/src/ejabberd_auth_riak.erl
index 67f2126be..df3321332 100644
--- a/src/ejabberd_auth_riak.erl
+++ b/src/ejabberd_auth_riak.erl
@@ -270,7 +270,7 @@ remove_user(User, Server, Password) ->
 
 is_scrammed() ->
     scram ==
-      ejabberd_config:get_local_option({auth_password_format, ?MYNAME},
+      ejabberd_config:get_option({auth_password_format, ?MYNAME},
                                        fun(V) -> V end).
 
 password_to_scram(Password) ->
diff --git a/src/ejabberd_commands.erl b/src/ejabberd_commands.erl
index 9491288f9..9bfa94dd6 100644
--- a/src/ejabberd_commands.erl
+++ b/src/ejabberd_commands.erl
@@ -332,7 +332,7 @@ expose_commands(Commands) ->
                       end,
                       Commands),
 
-    case ejabberd_config:add_local_option(commands, [{add_commands, Names}]) of
+    case ejabberd_config:add_option(commands, [{add_commands, Names}]) of
         {aborted, Reason} ->
             {error, Reason};
         {atomic, Result} ->