diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
index 7c5263a0..55c40b3b 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
@@ -323,12 +323,12 @@ class AccountActivity : AppCompatActivity() {
                 if (regCheck.isChecked) {
                     if (acc.regint != 3600) {
                         newRegint = 3600
-                        UserAgent.updateStatus(ua, R.drawable.dot_yellow)
+                        ua.updateStatus(R.drawable.dot_yellow)
                     }
                 } else {
                     if (acc.regint != 0) {
                         Api.ua_unregister(ua.uap)
-                        UserAgent.updateStatus(ua, R.drawable.dot_white)
+                        ua.updateStatus(R.drawable.dot_white)
                         newRegint = 0
                     }
                 }
diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountListAdapter.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountListAdapter.kt
index 5af4e4f8..dc5e7863 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/AccountListAdapter.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/AccountListAdapter.kt
@@ -45,7 +45,7 @@ class AccountListAdapter(private val cxt: Context, private val rows: ArrayList<A
                 Api.ua_destroy(ua.uap)
                 CallHistory.clear(ua.account.aor)
                 Message.clear(ua.account.aor)
-                UserAgent.remove(ua)
+                ua.remove()
                 AccountsActivity.generateAccounts()
                 AccountsActivity.saveAccounts()
                 this.notifyDataSetChanged()
diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt
index 4019b1f6..72f7fa6b 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt
@@ -62,7 +62,7 @@ class AccountsActivity : AppCompatActivity() {
                     newAorView.setText("")
                     newAorView.hint = getString(R.string.user_domain)
                     newAorView.clearFocus()
-                    UserAgent.add(ua, R.drawable.dot_white)
+                    ua.add(R.drawable.dot_white)
                     generateAccounts()
                     alAdapter.notifyDataSetChanged()
                     saveAccounts()
diff --git a/app/src/main/kotlin/com/tutpro/baresip/UserAgent.kt b/app/src/main/kotlin/com/tutpro/baresip/UserAgent.kt
index 759ae4fc..f33d2cf6 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/UserAgent.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/UserAgent.kt
@@ -5,6 +5,21 @@ class UserAgent(val uap: String) {
     val account = Account(Api.ua_account(uap))
     var registrationFailed = false
 
+    fun add(status: Int) {
+        BaresipService.uas.add(this)
+        BaresipService.status.add(status)
+    }
+
+    fun remove() {
+        val index = BaresipService.uas.indexOf(this)
+        BaresipService.uas.remove(this)
+        BaresipService.status.removeAt(index)
+    }
+
+    fun updateStatus(status: Int) {
+        BaresipService.status[BaresipService.uas.indexOf(this)] = status
+    }
+
     companion object {
 
         fun uas(): ArrayList<UserAgent> {
@@ -15,26 +30,6 @@ class UserAgent(val uap: String) {
             return BaresipService.status
         }
 
-        fun add(ua: UserAgent, status: Int) {
-            BaresipService.uas.add(ua)
-            BaresipService.status.add(status)
-        }
-
-        fun remove(ua: UserAgent) {
-            val index = BaresipService.uas.indexOf(ua)
-            if (index != -1) {
-                BaresipService.uas.removeAt(index)
-                BaresipService.status.removeAt(index)
-            }
-        }
-
-        fun updateStatus(ua: UserAgent, status: Int) {
-            val index = BaresipService.uas.indexOf(ua)
-            if (index != -1) {
-                BaresipService.status[index] = status
-            }
-        }
-
         fun ofAor(aor: String): UserAgent? {
             for (ua in BaresipService.uas)
                 if (ua.account.aor == aor) return ua