diff --git a/app/src/main/assets/config b/app/src/main/assets/config
index 81f33bd3..f7b1d0d1 100644
--- a/app/src/main/assets/config
+++ b/app/src/main/assets/config
@@ -35,8 +35,8 @@ module ice.so
 module srtp.so
 module dtls_srtp.so
 module zrtp.so
-module_tmp uuid.so
-module_tmp account.so
+module uuid.so
+module_app account.so
 module_app contact.so
 module_app debug_cmd.so
 module_app mwi.so
diff --git a/app/src/main/kotlin/com/tutpro/baresip/Config.kt b/app/src/main/kotlin/com/tutpro/baresip/Config.kt
index b32ab790..0a375eac 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/Config.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/Config.kt
@@ -14,6 +14,10 @@ object Config {
 
         Log.d(TAG, "Config is '$config'")
 
+        config = config.replace("module_tmp uuid.so", "module uuid.so")
+
+        config = config.replace("module_tmp account.so", "module_app account.so")
+
         if (!config.contains(Regex("ausrc_format s16"))) {
             config = "${config}ausrc_format s16\nauplay_format s16\nauenc_format s16\naudec_format s16\nmodule webrtc_aec.so\n"
         }