diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
index 3bcdcd7b..99ef1de1 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
@@ -212,6 +212,9 @@ class AccountActivity : AppCompatActivity() {
 
         if (BaresipService.activities.indexOf("account,$accp") == -1) return true
 
+        val intent = Intent()
+        intent.putExtra("aor", aor)
+
         when (item.itemId) {
 
             R.id.checkIcon -> {
@@ -466,25 +469,17 @@ class AccountActivity : AppCompatActivity() {
                 if (regCheck.isChecked && !((acc.authUser != "") && (acc.authPass == "")))
                     Api.ua_register(ua.uap)
 
-                BaresipService.activities.remove("account,$accp")
-                val i = Intent()
-                i.putExtra("accp", accp)
-                setResult(Activity.RESULT_OK, i)
-                finish()
-
+                setResult(Activity.RESULT_OK, intent)
             }
 
-            android.R.id.home -> {
-
-                BaresipService.activities.remove("account,$accp")
-                val i = Intent()
-                setResult(Activity.RESULT_CANCELED, i)
-                finish()
-
-            }
+            android.R.id.home ->
+                setResult(Activity.RESULT_CANCELED, intent)
 
         }
 
+        BaresipService.activities.remove("account,$accp")
+        finish()
+
         return true
 
     }
@@ -492,8 +487,9 @@ class AccountActivity : AppCompatActivity() {
     override fun onBackPressed() {
 
         BaresipService.activities.remove("account,$accp")
-        val i = Intent()
-        setResult(Activity.RESULT_CANCELED, i)
+        val intent = Intent()
+        intent.putExtra("aor", aor)
+        setResult(Activity.RESULT_CANCELED, intent)
         finish()
         super.onBackPressed()
 
diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt
index 89ef6636..2c83e2ca 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt
@@ -79,7 +79,7 @@ class AccountsActivity : AppCompatActivity() {
         when (requestCode) {
             ACCOUNT_CODE -> {
                 if (resultCode == Activity.RESULT_OK) {
-                    val aor = Account.find(data!!.getStringExtra("accp"))!!.aor
+                    val aor = data!!.getStringExtra("aor")
                     val ua = UserAgent.uas()[UserAgent.findAorIndex(aor)!!]
                     if (aorPasswords.containsKey(aor) && aorPasswords[aor] == "")
                         askPassword(String.format(getString(R.string.account_password),
diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
index d28a7ac0..76c78043 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
@@ -1114,13 +1114,14 @@ class MainActivity : AppCompatActivity() {
             }
 
             ACCOUNT_CODE -> {
-                val ua = UserAgent.uas()[aorSpinner.selectedItemPosition]
-                val account = ua.account
-                updateIcons(account)
+                val aor = data!!.getStringExtra("aor")
+                spinToAor(aor)
+                val ua = Account.findUa(aor)!!
+                updateIcons(ua.account)
                 if (resultCode == Activity.RESULT_OK)
-                    if (aorPasswords.containsKey(account.aor) && aorPasswords[account.aor] == "")
+                    if (aorPasswords.containsKey(aor) && aorPasswords[aor] == "")
                         askPassword(String.format(getString(R.string.account_password),
-                                Utils.plainAor(account.aor)), ua)
+                                Utils.plainAor(aor)), ua)
             }
 
             CONTACTS_CODE -> {