diff --git a/app/src/main/java/com/etesync/syncadapter/ui/AccountActivity.kt b/app/src/main/java/com/etesync/syncadapter/ui/AccountActivity.kt
index 8417e9ac..cfbc8fd2 100644
--- a/app/src/main/java/com/etesync/syncadapter/ui/AccountActivity.kt
+++ b/app/src/main/java/com/etesync/syncadapter/ui/AccountActivity.kt
@@ -52,6 +52,7 @@ import com.etesync.syncadapter.utils.ShowcaseBuilder
 import com.etesync.syncadapter.utils.packageInstalled
 import com.google.android.material.snackbar.Snackbar
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import org.acra.ACRA
 import org.jetbrains.anko.doAsync
 import tourguide.tourguide.ToolTip
 import java.util.logging.Level
@@ -105,6 +106,9 @@ class AccountActivity : BaseActivity(), Toolbar.OnMenuItemClickListener, PopupMe
         title = account.name
         settings = AccountSettings(this, account)
 
+        // Set it for ACRA in case we crash in any of the user views
+        ACRA.getErrorReporter().putCustomData("username", account.name)
+
         setContentView(R.layout.activity_account)
 
         val icMenu = ContextCompat.getDrawable(this, R.drawable.ic_menu_light)
diff --git a/app/src/main/java/com/etesync/syncadapter/ui/DebugInfoActivity.kt b/app/src/main/java/com/etesync/syncadapter/ui/DebugInfoActivity.kt
index 34a70cb9..33fd9c72 100644
--- a/app/src/main/java/com/etesync/syncadapter/ui/DebugInfoActivity.kt
+++ b/app/src/main/java/com/etesync/syncadapter/ui/DebugInfoActivity.kt
@@ -27,9 +27,9 @@ import android.widget.TextView
 import androidx.core.content.ContextCompat
 import at.bitfire.ical4android.TaskProvider.ProviderName
 import at.bitfire.vcard4android.ContactsStorageException
+import com.etesync.journalmanager.Exceptions.HttpException
 import com.etesync.syncadapter.*
 import com.etesync.syncadapter.Constants.KEY_ACCOUNT
-import com.etesync.journalmanager.Exceptions.HttpException
 import com.etesync.syncadapter.log.Logger
 import com.etesync.syncadapter.model.EntryEntity
 import com.etesync.syncadapter.model.JournalEntity
@@ -66,6 +66,10 @@ class DebugInfoActivity : BaseActivity(), LoaderManager.LoaderCallbacks<String>
 
     fun onShare(item: MenuItem) {
         ACRA.getErrorReporter().putCustomData("debug_info", report)
+        val account: Account? = intent.extras?.getParcelable(KEY_ACCOUNT)
+        if (account != null) {
+            ACRA.getErrorReporter().putCustomData("username", account.name)
+        }
         ACRA.getErrorReporter().handleException(intent.extras?.getSerializable(KEY_THROWABLE) as Throwable?)
         ACRA.getErrorReporter().removeCustomData("debug_info")
     }