diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
index e255fc5e..d2377a2e 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
@@ -261,8 +261,19 @@ class AccountActivity : AppCompatActivity() {
             finish()
             return true
 
-        } else
-            return super.onOptionsItemSelected(item)
+        } else if (item.itemId == android.R.id.home) {
+
+            Log.d("Baresip", "Back array was pressed at Account")
+            intent.putExtra("action", "cancel")
+            if (acc.regint > 0) {
+                Log.d("Baresip", "Registering ${acc.aor}")
+                UserAgent.ua_register(Account.findUA(acc.aor)!!.uap)
+            }
+            setResult(RESULT_OK, intent)
+            finish()
+            return true
+
+        } else return super.onOptionsItemSelected(item)
     }
 
     private fun checkDisplayName(dn: String): Boolean {
diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt
index 6eaf3f89..54575ad3 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt
@@ -58,7 +58,7 @@ class AccountsActivity : AppCompatActivity() {
             android.R.id.home -> {
                 Log.d("Baresip", "Back array was pressed at Accounts")
                 val i = Intent()
-                setResult(Activity.RESULT_CANCELED, i)
+                setResult(Activity.RESULT_OK, i)
                 finish()
             }
         }
diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
index bec288ce..17442639 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
@@ -89,10 +89,9 @@ class MainActivity : AppCompatActivity() {
                 val intentExtras = intent.extras
                 val info = intentExtras.getParcelable<NetworkInfo>("networkInfo")
                 Log.d("Baresip", "Got event $info")
-                if (running && (info.state == NetworkInfo.State.CONNECTED)) {
-                    Log.d("Baresip", "Registering upon CONNECTED event")
-                    UserAgent.register(uas)
-                }
+                //if (running && (info.state == NetworkInfo.State.CONNECTED)) {
+                // Log.d("Baresip", "Registering upon CONNECTED event")
+                if (running) UserAgent.register(uas)
             }
         }
         registerReceiver(receiver, intentFilter)
@@ -458,11 +457,8 @@ class MainActivity : AppCompatActivity() {
         when (requestCode) {
 
             ACCOUNTS_CODE -> {
-                if (resultCode == RESULT_OK)
-                    Log.d("Baresip", "Edit accounts OK")
-                if (resultCode == RESULT_CANCELED)
-                    Log.d("Baresip", "Edit accounts canceled")
                 uaAdapter.notifyDataSetChanged()
+                updateNotification()
             }
 
             EDIT_CONFIG_CODE -> {
@@ -704,9 +700,9 @@ class MainActivity : AppCompatActivity() {
         layout.addView(answer_row)
     }
 
-    private fun updateNotification() {
+    fun updateNotification() {
         val contentView = RemoteViews(getPackageName(), R.layout.notification)
-        for (i: Int in 0 .. 3)  {
+        for (i: Int in 0 .. 5)  {
             val resID = resources.getIdentifier("status$i", "id", packageName);
             if (i < images.size) {
                 contentView.setImageViewResource(resID, images[i])