diff --git a/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferActivity.kt b/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferActivity.kt
index 98025cfbd4..89a7caa764 100644
--- a/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferActivity.kt
@@ -51,7 +51,10 @@ data class CallTransferArgs(val callId: String) : Parcelable
 
 private const val USER_LIST_FRAGMENT_TAG = "USER_LIST_FRAGMENT_TAG"
 
-class CallTransferActivity : VectorBaseActivity<ActivityCallTransferBinding>(), CallTransferViewModel.Factory, UserListViewModel.Factory, ContactsBookViewModel.Factory {
+class CallTransferActivity : VectorBaseActivity<ActivityCallTransferBinding>(),
+        CallTransferViewModel.Factory,
+        UserListViewModel.Factory,
+        ContactsBookViewModel.Factory {
 
     private lateinit var sharedActionViewModel: UserListSharedActionViewModel
     @Inject lateinit var userListViewModelFactory: UserListViewModel.Factory
diff --git a/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferViewEvents.kt b/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferViewEvents.kt
index 9ac5cdac4f..b110164d1e 100644
--- a/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferViewEvents.kt
@@ -17,7 +17,6 @@
 package im.vector.app.features.call.transfer
 
 import im.vector.app.core.platform.VectorViewEvents
-import im.vector.app.features.roommemberprofile.RoomMemberProfileViewEvents
 
 sealed class CallTransferViewEvents : VectorViewEvents {
     object Dismiss : CallTransferViewEvents()
diff --git a/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferViewModel.kt b/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferViewModel.kt
index 1a40fa2c8e..2c5ef94a69 100644
--- a/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferViewModel.kt
@@ -18,7 +18,6 @@ package im.vector.app.features.call.transfer
 
 import androidx.lifecycle.viewModelScope
 import com.airbnb.mvrx.ActivityViewModelContext
-import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
@@ -29,7 +28,6 @@ import im.vector.app.features.call.webrtc.WebRtcCallManager
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.call.CallState
 import org.matrix.android.sdk.api.session.call.MxCall
-import timber.log.Timber
 
 class CallTransferViewModel @AssistedInject constructor(@Assisted initialState: CallTransferViewState,
                                                         private val callManager: WebRtcCallManager)
diff --git a/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt b/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt
index 7ad99c2d50..fb171726e4 100644
--- a/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt
+++ b/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt
@@ -711,7 +711,6 @@ class WebRtcCall(val mxCall: MxCall,
         if (mxCall.state == CallState.Terminated) {
             return
         }
-        mxCall.state = CallState.Terminated
         // Close tracks ASAP
         localVideoTrack?.setEnabled(false)
         localVideoTrack?.setEnabled(false)
@@ -724,11 +723,13 @@ class WebRtcCall(val mxCall: MxCall,
         }
         onCallEnded(this)
         if (originatedByMe) {
-            if (mxCall.state is CallState.Connected || mxCall.isOutgoing) {
-                mxCall.hangUp(reason)
-            } else {
+            if (mxCall.state is CallState.LocalRinging) {
                 mxCall.reject()
+            } else {
+                mxCall.hangUp(reason)
             }
+        } else {
+            mxCall.state = CallState.Terminated
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/userdirectory/UserListFragment.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserListFragment.kt
index 69e4c58c24..96f459cbbf 100644
--- a/vector/src/main/java/im/vector/app/features/userdirectory/UserListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserListFragment.kt
@@ -67,12 +67,12 @@ class UserListFragment @Inject constructor(
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         sharedActionViewModel = activityViewModelProvider.get(UserListSharedActionViewModel::class.java)
-        if(args.showToolbar) {
+        if (args.showToolbar) {
             views.userListTitle.text = args.title
             vectorBaseActivity.setSupportActionBar(views.userListToolbar)
             setupCloseView()
             views.userListToolbar.isVisible = true
-        }else{
+        } else {
             views.userListToolbar.isVisible = false
         }
         setupRecyclerView()