diff --git a/android/kotlin/AccountLogin/app/src/main/java/org/linphone/accountlogin/AccountLoginActivity.kt b/android/kotlin/AccountLogin/app/src/main/java/org/linphone/accountlogin/AccountLoginActivity.kt
index cb2ac09..51b1d2f 100644
--- a/android/kotlin/AccountLogin/app/src/main/java/org/linphone/accountlogin/AccountLoginActivity.kt
+++ b/android/kotlin/AccountLogin/app/src/main/java/org/linphone/accountlogin/AccountLoginActivity.kt
@@ -39,8 +39,10 @@ class AccountLoginActivity: AppCompatActivity() {
             // Otherwise, we will be Failed.
             findViewById<TextView>(R.id.registration_status).text = message
 
-            if (state == RegistrationState.Failed) {
+            if (state == RegistrationState.Failed || state == RegistrationState.Cleared) {
                 findViewById<Button>(R.id.connect).isEnabled = true
+            } else if (state == RegistrationState.Ok) {
+                findViewById<Button>(R.id.disconnect).isEnabled = true
             }
         }
     }
@@ -59,6 +61,16 @@ class AccountLoginActivity: AppCompatActivity() {
             it.isEnabled = false
         }
 
+        findViewById<Button>(R.id.disconnect).setOnClickListener {
+            unregister()
+            it.isEnabled = false
+        }
+
+        findViewById<Button>(R.id.delete).setOnClickListener {
+            delete()
+            it.isEnabled = false
+        }
+
         val coreVersion = findViewById<TextView>(R.id.core_version)
         coreVersion.text = core.version
     }
@@ -111,6 +123,9 @@ class AccountLoginActivity: AppCompatActivity() {
         // Also set the newly added account as default
         core.defaultAccount = account
 
+        // Allow account to be removed
+        findViewById<Button>(R.id.delete).isEnabled = true
+
         // To be notified of the connection status of our account, we need to add the listener to the Core
         core.addListener(coreListener)
         // We can also register a callback on the Account object
@@ -122,4 +137,33 @@ class AccountLoginActivity: AppCompatActivity() {
         // Finally we need the Core to be started for the registration to happen (it could have been started before)
         core.start()
     }
+
+    private fun unregister() {
+        // Here we will disable the registration of our Account
+        val account = core.defaultAccount
+        account ?: return
+
+        val params = account.params
+        // Returned params object is const, so to make changes we first need to clone it
+        val clonedParams = params.clone()
+
+        // Now let's make our changes
+        clonedParams.registerEnabled = false
+
+        // And apply them
+        account.params = clonedParams
+    }
+
+    private fun delete() {
+        // To completely remove an Account
+        val account = core.defaultAccount
+        account ?: return
+        core.removeAccount(account)
+
+        // To remove all accounts use
+        core.clearAccounts()
+
+        // Same for auth info
+        core.clearAllAuthInfo()
+    }
 }
\ No newline at end of file
diff --git a/android/kotlin/AccountLogin/app/src/main/res/layout/account_login_activity.xml b/android/kotlin/AccountLogin/app/src/main/res/layout/account_login_activity.xml
index 88328fb..f642c33 100644
--- a/android/kotlin/AccountLogin/app/src/main/res/layout/account_login_activity.xml
+++ b/android/kotlin/AccountLogin/app/src/main/res/layout/account_login_activity.xml
@@ -66,6 +66,20 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
+    <Button
+        android:id="@+id/disconnect"
+        android:text="Disconnect"
+        android:enabled="false"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <Button
+        android:id="@+id/delete"
+        android:text="Delete"
+        android:enabled="false"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
     <TextView
         android:id="@+id/registration_status"
         android:layout_width="wrap_content"