diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
index 704539e7..d2d46295 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
@@ -7,16 +7,10 @@ import androidx.appcompat.app.AppCompatActivity
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
-import android.widget.LinearLayout.LayoutParams
 import android.widget.*
 
 import kotlinx.android.synthetic.main.activity_account.*
 
-import com.tutpro.baresip.Account.Companion.checkAuthPass
-import com.tutpro.baresip.Account.Companion.checkAuthUser
-import com.tutpro.baresip.Account.Companion.checkDisplayName
-import com.tutpro.baresip.MainActivity.Companion.aorPasswords
-
 class AccountActivity : AppCompatActivity() {
 
     internal lateinit var acc: Account
@@ -66,7 +60,7 @@ class AccountActivity : AppCompatActivity() {
         authUser.setText(acc.authUser)
 
         authPass = findViewById(R.id.AuthPass) as EditText
-        if (aorPasswords.containsKey(aor))
+        if (MainActivity.aorPasswords.containsKey(aor))
             authPass.setText("")
         else
             authPass.setText(acc.authPass)
@@ -183,7 +177,7 @@ class AccountActivity : AppCompatActivity() {
             R.id.checkIcon -> {
                 val dn = displayName.text.toString().trim()
                 if (dn != acc.displayName) {
-                    if (checkDisplayName(dn)) {
+                    if (Account.checkDisplayName(dn)) {
                         if (account_set_display_name(acc.accp, dn) == 0) {
                             acc.displayName = account_display_name(acc.accp);
                             Log.d("Baresip", "New display name is ${acc.displayName}")
@@ -202,7 +196,7 @@ class AccountActivity : AppCompatActivity() {
                 val ap = authPass.text.toString().trim()
 
                 if (au != acc.authUser) {
-                    if (checkAuthUser(au)) {
+                    if (Account.checkAuthUser(au)) {
                         if (account_set_auth_user(acc.accp, au) == 0) {
                             acc.authUser = account_auth_user(acc.accp);
                             Log.d("Baresip", "New auth user is ${acc.authUser}")
@@ -219,30 +213,30 @@ class AccountActivity : AppCompatActivity() {
 
                 if (ap != "") {
                     if (ap != acc.authPass) {
-                        if (checkAuthPass(ap)) {
+                        if (Account.checkAuthPass(ap)) {
                             setAuthPass(acc, ap)
-                            aorPasswords.remove(aor)
+                            MainActivity.aorPasswords.remove(aor)
                         } else {
                             Utils.alertView(this, getString(R.string.notice),
                                     String.format(getString(R.string.invalid_authentication_password), ap))
                             return false
                         }
                     } else {
-                        if (aorPasswords.containsKey(aor)) {
-                            aorPasswords.remove(aor)
+                        if (MainActivity.aorPasswords.containsKey(aor)) {
+                            MainActivity.aorPasswords.remove(aor)
                             save = true
                         }
                     }
                 } else { // ap == ""
                     if (acc.authUser != "") {
-                        if (!aorPasswords.containsKey(aor)) {
+                        if (!MainActivity.aorPasswords.containsKey(aor)) {
                             setAuthPass(acc, "")
-                            aorPasswords.put(aor, "")
+                            MainActivity.aorPasswords.put(aor, "")
                         }
                     } else {
                         if (acc.authPass != "") {
                             setAuthPass(acc, "")
-                            aorPasswords.remove(aor)
+                            MainActivity.aorPasswords.remove(aor)
                         }
                     }
                 }
@@ -509,7 +503,7 @@ class AccountActivity : AppCompatActivity() {
     private fun setAuthPass(acc: Account, ap: String) {
         if (account_set_auth_pass(acc.accp, ap) == 0) {
             acc.authPass = account_auth_pass(acc.accp)
-            aorPasswords.remove(acc.aor)
+            MainActivity.aorPasswords.remove(acc.aor)
             save = true
         } else {
             Log.e("Baresip", "Setting of auth pass failed")
diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountListAdapter.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountListAdapter.kt
index dc5e7863..d070def9 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/AccountListAdapter.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/AccountListAdapter.kt
@@ -12,8 +12,6 @@ import android.widget.ArrayAdapter
 import android.widget.ImageButton
 import android.widget.TextView
 
-import com.tutpro.baresip.MainActivity.Companion.ACCOUNT_CODE
-
 import java.util.*
 
 class AccountListAdapter(private val cxt: Context, private val rows: ArrayList<AccountRow>) :
@@ -32,7 +30,7 @@ class AccountListAdapter(private val cxt: Context, private val rows: ArrayList<A
             val b = Bundle()
             b.putString("aor", UserAgent.uas()[position].account.aor)
             i.putExtras(b)
-            (cxt as Activity).startActivityForResult(i, ACCOUNT_CODE)
+            (cxt as Activity).startActivityForResult(i, MainActivity.ACCOUNT_CODE)
         }
         val ua = UserAgent.uas()[position]
         val actionView = rowView.findViewById(R.id.action) as ImageButton
diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt
index 062a6e5c..1fb2ed80 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt
@@ -13,10 +13,6 @@ import android.view.MenuItem
 import android.view.ViewGroup
 import android.widget.*
 
-import com.tutpro.baresip.Account.Companion.checkAuthPass
-import com.tutpro.baresip.MainActivity.Companion.ACCOUNT_CODE
-import com.tutpro.baresip.MainActivity.Companion.aorPasswords
-
 import java.util.ArrayList
 
 class AccountsActivity : AppCompatActivity() {
@@ -70,7 +66,7 @@ class AccountsActivity : AppCompatActivity() {
                     val b = Bundle()
                     b.putString("aor", ua.account.aor)
                     i.putExtras(b)
-                    startActivityForResult(i, ACCOUNT_CODE)
+                    startActivityForResult(i, MainActivity.ACCOUNT_CODE)
                 }
             }
         }
@@ -82,11 +78,11 @@ class AccountsActivity : AppCompatActivity() {
         super.onActivityResult(requestCode, resultCode, data)
 
         when (requestCode) {
-            ACCOUNT_CODE -> {
+            MainActivity.ACCOUNT_CODE -> {
                 if (resultCode == Activity.RESULT_OK) {
                     val aor = data!!.getStringExtra("aor")!!
                     val ua = UserAgent.ofAor(aor)!!
-                    if (aorPasswords.containsKey(aor) && aorPasswords[aor] == "")
+                    if (MainActivity.aorPasswords.containsKey(aor) && MainActivity.aorPasswords[aor] == "")
                         askPassword(String.format(getString(R.string.account_password),
                                 Utils.plainAor(aor)), ua)
                 }
@@ -113,7 +109,7 @@ class AccountsActivity : AppCompatActivity() {
         builder.setPositiveButton(android.R.string.ok) { dialog, _ ->
             dialog.dismiss()
             var password = input.text.toString().trim()
-            if (!checkAuthPass(password)) {
+            if (!Account.checkAuthPass(password)) {
                 Utils.alertView(this, getString(R.string.notice),
                         String.format(getString(R.string.invalid_authentication_password), password))
                 password = ""
@@ -198,7 +194,7 @@ class AccountsActivity : AppCompatActivity() {
             val acc = ua.account
             if (account_set_auth_pass(acc.accp, ap) == 0) {
                 acc.authPass = account_auth_pass(acc.accp)
-                aorPasswords[acc.aor] = ap
+                MainActivity.aorPasswords[acc.aor] = ap
                 if ((ap != "") && (acc.regint > 0))
                     Api.ua_register(ua.uap)
             } else {
diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
index b156e96f..208eee54 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
@@ -20,8 +20,6 @@ import android.view.*
 import java.io.File
 import kotlin.collections.ArrayList
 
-import com.tutpro.baresip.Account.Companion.checkAuthPass
-
 class MainActivity : AppCompatActivity() {
 
     internal lateinit var layout: RelativeLayout
@@ -1041,7 +1039,7 @@ class MainActivity : AppCompatActivity() {
         builder.setPositiveButton(android.R.string.ok) { dialog, _ ->
             dialog.dismiss()
             var password = input.text.toString().trim()
-            if (!checkAuthPass(password)) {
+            if (!Account.checkAuthPass(password)) {
                 Utils.alertView(this, getString(R.string.notice),
                         String.format(getString(R.string.invalid_authentication_password), password))
                 password = ""
@@ -1085,7 +1083,7 @@ class MainActivity : AppCompatActivity() {
                 builder.setPositiveButton(android.R.string.ok) { dialog, _ ->
                     dialog.dismiss()
                     val password = input.text.toString().trim()
-                    if (!checkAuthPass(password)) {
+                    if (!Account.checkAuthPass(password)) {
                         Utils.alertView(this, getString(R.string.notice),
                                 String.format(getString(R.string.invalid_authentication_password),  password))
                     } else {